From 0665762ec6e5c1d8f0da50b42f128e011b88c09c Mon Sep 17 00:00:00 2001
From: simatec <nais@gmx.net>
Date: Sun, 22 Jan 2023 21:29:57 +0100
Subject: [PATCH] (simatec) Fix Docker Build

---
 build/build.conf         | 2 +-
 build/build.sh           | 6 +++---
 config/piler-default.yml | 2 +-
 config/piler-ssl.yml     | 2 +-
 install-piler.sh         | 3 ++-
 update.sh                | 3 ++-
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/build/build.conf b/build/build.conf
index 152f6e4..8153283 100644
--- a/build/build.conf
+++ b/build/build.conf
@@ -8,4 +8,4 @@ PILER_VERSION="1.4.3"
 
 # MariaDB Version
 
-MARIADB_VERSION="10.6"
\ No newline at end of file
+MARIA_DB_VERSION="10.6"
\ No newline at end of file
diff --git a/build/build.sh b/build/build.sh
index 02df73f..d71f4ac 100644
--- a/build/build.sh
+++ b/build/build.sh
@@ -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
diff --git a/config/piler-default.yml b/config/piler-default.yml
index 7b3f5dc..5ba3420 100644
--- a/config/piler-default.yml
+++ b/config/piler-default.yml
@@ -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:
diff --git a/config/piler-ssl.yml b/config/piler-ssl.yml
index 1e096f1..26fb30d 100644
--- a/config/piler-ssl.yml
+++ b/config/piler-ssl.yml
@@ -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:
diff --git a/install-piler.sh b/install-piler.sh
index 865dbbc..9244c1f 100644
--- a/install-piler.sh
+++ b/install-piler.sh
@@ -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
diff --git a/update.sh b/update.sh
index c7aa7a9..ea4f098 100644
--- a/update.sh
+++ b/update.sh
@@ -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