Phil/piler-docker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(simatec) Fix Docker Build

Browse source
This commit is contained in:
simatec 2023-01-22 21:29:57 +01:00
parent 9c04aae9ca
commit 0665762ec6
6 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/build.conf
View file

@ -8,4 +8,4 @@ PILER_VERSION="1.4.3"
# MariaDB Version # MariaDB Version
MARIADB_VERSION="10.6" MARIA_DB_VERSION="10.6"

6
build/build.sh
View file

@ -15,13 +15,13 @@ chmod a+x start.sh
sed -i 's/PILER_VERSION=.*/PILER_VERSION="'$PILER_VERSION'"/g' ../piler.conf sed -i 's/PILER_VERSION=.*/PILER_VERSION="'$PILER_VERSION'"/g' ../piler.conf
# set Maria-DB Version # set Maria-DB Version
sed -i 's/MARIADB_VERSION=.*/MARIADB_VERSION="'$MARIADB_VERSION'"/g' ../piler.conf sed -i 's/MARIA_DB_VERSION=.*/MARIA_DB_VERSION="'$MARIA_DB_VERSION'"/g' ../piler.conf
MARIADB_VERSION
# Package Download # Package Download
rm -f $buildPth/*.deb rm -f $buildPth/*.deb
curl -o $buildPth/$PILER_PACKAGE https://bitbucket.org/jsuto/piler/downloads/$PILER_PACKAGE curl -OL https://bitbucket.org/jsuto/piler/downloads/$PILER_PACKAGE
set -o errexit set -o errexit
set -o pipefail set -o pipefail

2
config/piler-default.yml
View file

@ -2,7 +2,7 @@ version: "3"
services: services:
mysql: mysql:
image: mariadb:${MARIADB_VERSION} image: mariadb:${MARIA_DB_VERSION}
container_name: mysql_piler container_name: mysql_piler
restart: unless-stopped restart: unless-stopped
cap_drop: cap_drop:

2
config/piler-ssl.yml
View file

@ -23,7 +23,7 @@ services:
environment: environment:
- DEFAULT_EMAIL=${LETSENCRYPT_EMAIL} - DEFAULT_EMAIL=${LETSENCRYPT_EMAIL}
mysql: mysql:
image: mariadb:${MARIADB_VERSION} image: mariadb:${MARIA_DB_VERSION}
container_name: mysql-piler container_name: mysql-piler
restart: unless-stopped restart: unless-stopped
cap_drop: cap_drop:

3
install-piler.sh
View file

@ -276,7 +276,8 @@ if [ ! -f $installPth/.env ]; then
fi fi
# Build Piler # Build Piler
bash $buildPth/build.sh cd $buildPth
bash build.sh
if [ -f $installPth/docker-compose.yml ]; then if [ -f $installPth/docker-compose.yml ]; then
rm $installPth/docker-compose.yml rm $installPth/docker-compose.yml

3
update.sh
View file

@ -183,7 +183,8 @@ if [ ! -f $etcPth/MANTICORE ]; then
fi fi
# Build Piler # Build Piler
bash $buildPth/build.sh cd $buildPth
bash build.sh
# Copy docker-compose.yml # Copy docker-compose.yml
if [ "$USE_LETSENCRYPT" = "yes" ]; then if [ "$USE_LETSENCRYPT" = "yes" ]; then