(simatec) Fix Docker Build
This commit is contained in:
parent
9c04aae9ca
commit
0665762ec6
6 changed files with 10 additions and 8 deletions
|
@ -8,4 +8,4 @@ PILER_VERSION="1.4.3"
|
|||
|
||||
# MariaDB Version
|
||||
|
||||
MARIADB_VERSION="10.6"
|
||||
MARIA_DB_VERSION="10.6"
|
|
@ -15,13 +15,13 @@ chmod a+x start.sh
|
|||
sed -i 's/PILER_VERSION=.*/PILER_VERSION="'$PILER_VERSION'"/g' ../piler.conf
|
||||
|
||||
# set Maria-DB Version
|
||||
sed -i 's/MARIADB_VERSION=.*/MARIADB_VERSION="'$MARIADB_VERSION'"/g' ../piler.conf
|
||||
MARIADB_VERSION
|
||||
sed -i 's/MARIA_DB_VERSION=.*/MARIA_DB_VERSION="'$MARIA_DB_VERSION'"/g' ../piler.conf
|
||||
|
||||
|
||||
# Package Download
|
||||
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 pipefail
|
||||
|
|
|
@ -2,7 +2,7 @@ version: "3"
|
|||
services:
|
||||
|
||||
mysql:
|
||||
image: mariadb:${MARIADB_VERSION}
|
||||
image: mariadb:${MARIA_DB_VERSION}
|
||||
container_name: mysql_piler
|
||||
restart: unless-stopped
|
||||
cap_drop:
|
||||
|
|
|
@ -23,7 +23,7 @@ services:
|
|||
environment:
|
||||
- DEFAULT_EMAIL=${LETSENCRYPT_EMAIL}
|
||||
mysql:
|
||||
image: mariadb:${MARIADB_VERSION}
|
||||
image: mariadb:${MARIA_DB_VERSION}
|
||||
container_name: mysql-piler
|
||||
restart: unless-stopped
|
||||
cap_drop:
|
||||
|
|
|
@ -276,7 +276,8 @@ if [ ! -f $installPth/.env ]; then
|
|||
fi
|
||||
|
||||
# Build Piler
|
||||
bash $buildPth/build.sh
|
||||
cd $buildPth
|
||||
bash build.sh
|
||||
|
||||
if [ -f $installPth/docker-compose.yml ]; then
|
||||
rm $installPth/docker-compose.yml
|
||||
|
|
|
@ -183,7 +183,8 @@ if [ ! -f $etcPth/MANTICORE ]; then
|
|||
fi
|
||||
|
||||
# Build Piler
|
||||
bash $buildPth/build.sh
|
||||
cd $buildPth
|
||||
bash build.sh
|
||||
|
||||
# Copy docker-compose.yml
|
||||
if [ "$USE_LETSENCRYPT" = "yes" ]; then
|
||||
|
|
Loading…
Reference in a new issue