From 0dbbd8ee1094cdb9d51146a37ae28d4ecfad6d5f Mon Sep 17 00:00:00 2001
From: simatec <nais@gmx.net>
Date: Thu, 26 Jan 2023 21:48:51 +0100
Subject: [PATCH] (simatec) Update Piler

---
 .gitignore       |  4 ++--
 README.md        |  3 +++
 build/Dockerfile | 21 +++++++++++++--------
 build/build.conf |  2 +-
 build/build.sh   |  3 ++-
 install-piler.sh |  6 ++++--
 update.sh        |  9 ++++++---
 7 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0a5115b..6e8c476 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 .git
-test.sh
 .vscode
 .DS_Store
-/build/test_build.conf
\ No newline at end of file
+/build/test_build.conf
+piler.conf
\ No newline at end of file
diff --git a/README.md b/README.md
index f1cb671..160a7ec 100644
--- a/README.md
+++ b/README.md
@@ -152,6 +152,9 @@ To leave the container on the console you have to execute 2x `exit`.
 
 ## Changelog
 
+### 0.9.1 (23.01.2023)
+* (simatec) Piler updated
+
 ### 0.9.1 (23.01.2023)
 * (simatec) Piler Docker Hub added
 * (simatec) Fix Automatic Import
diff --git a/build/Dockerfile b/build/Dockerfile
index d236880..5eddee8 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -33,15 +33,20 @@ RUN apt-get update && \
     rm -f ${PACKAGE} /etc/nginx/sites-enabled/default /etc/piler/piler.key /etc/piler/piler.pem /etc/piler/config-site.php && \
     crontab -u $PILER_USER /usr/share/piler/piler.cron
 
-VOLUME ["/etc/piler"]
-VOLUME ["/var/piler/store"]
-VOLUME ["/var/piler/manticore"]
-VOLUME ["/var/piler/imap"]
-VOLUME ["/var/piler/stat"]
-VOLUME ["/var/spool/cron/crontabs"]
+VOLUME ["/etc/piler","/var/piler/store","/var/piler/manticore","/var/piler/imap","/var/piler/stat","/var/spool/cron/crontabs"]
 
-EXPOSE 25 80 443
+EXPOSE 25/tcp
+EXPOSE 80/tcp
+EXPOSE 443/tcp
+
+# Clean up APT when done.
+RUN apt clean && \
+    apt autoremove && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 COPY start.sh /start.sh
 
-CMD ["/start.sh"]
\ No newline at end of file
+# chmod start.sh
+RUN chmod a+x /start.sh
+
+CMD ["/start.sh"]
diff --git a/build/build.conf b/build/build.conf
index 8153283..77157e9 100644
--- a/build/build.conf
+++ b/build/build.conf
@@ -1,6 +1,6 @@
 # Piler Package
 
-PILER_PACKAGE="piler_1.4.3-jammy-ee8912fe_amd64.deb"
+PILER_PACKAGE="piler_1.4.3-jammy-38d8b519_amd64.deb"
 
 # Piler Version
 
diff --git a/build/build.sh b/build/build.sh
index 1063f47..3d9de5e 100644
--- a/build/build.sh
+++ b/build/build.sh
@@ -21,7 +21,8 @@ chmod a+x start.sh
 # Package Download
 rm -f $buildPth/*.deb
 
-curl -OL https://bitbucket.org/jsuto/piler/downloads/$PILER_PACKAGE
+#curl -OL https://bitbucket.org/jsuto/piler/downloads/$PILER_PACKAGE
+wget https://bitbucket.org/jsuto/piler/downloads/$PILER_PACKAGE -O $PILER_PACKAGE
 
 set -o errexit
 set -o pipefail
diff --git a/install-piler.sh b/install-piler.sh
index 8835917..23f698d 100644
--- a/install-piler.sh
+++ b/install-piler.sh
@@ -247,7 +247,8 @@ elif [ -f $installPth/.configDone ]; then
             for fileUpdate in update.sh README.md; do
                 echo "${purple}${HLINE}${HLINE_SMALL}"
                 echo "${purple}****** Download Update $fileUpdate ******"
-                curl -o $installPth/$fileUpdate https://raw.githubusercontent.com/simatec/piler-docker/main/$fileUpdate
+                #curl -o $installPth/$fileUpdate https://raw.githubusercontent.com/simatec/piler-docker/main/$fileUpdate
+                wget https://raw.githubusercontent.com/simatec/piler-docker/main/$fileUpdate -O $installPth/$fileUpdate
                 echo "${purple}${HLINE}${HLINE_SMALL}${normal}"
                 echo
             done
@@ -456,7 +457,8 @@ include('auth-mailcow.php');
 // ### end added by Piler-Installer ###
 EOF
 
-curl -o $etcPth/auth-mailcow.php https://raw.githubusercontent.com/patschi/mailpiler-mailcow-integration/master/auth-mailcow.php
+#curl -o $etcPth/auth-mailcow.php https://raw.githubusercontent.com/patschi/mailpiler-mailcow-integration/master/auth-mailcow.php
+wget https://raw.githubusercontent.com/patschi/mailpiler-mailcow-integration/master/auth-mailcow.php -O $etcPth/auth-mailcow.php
 fi
 
 # add config settings
diff --git a/update.sh b/update.sh
index 2490bc2..d001669 100644
--- a/update.sh
+++ b/update.sh
@@ -126,7 +126,8 @@ for ymlUpdate in piler-default.yml piler-ssl.yml; do
   echo
   echo "${purple}${HLINE}${HLINE_SMALL}"
   echo "${purple}****** Download Update $ymlUpdate ******"
-  curl -o $configPth/$ymlUpdate https://raw.githubusercontent.com/simatec/piler-docker/main/config/$ymlUpdate
+  #curl -o $configPth/$ymlUpdate https://raw.githubusercontent.com/simatec/piler-docker/main/config/$ymlUpdate
+  wget https://raw.githubusercontent.com/simatec/piler-docker/main/config/$ymlUpdate -O $configPth/$ymlUpdate
   echo "${purple}${HLINE}${HLINE_SMALL}${normal}"
   echo
 done
@@ -135,7 +136,8 @@ for fileUpdate in install-piler.sh LICENSE piler.conf.example; do
   echo
   echo "${purple}${HLINE}${HLINE_SMALL}"
   echo "${purple}****** Download Update $fileUpdate ******"
-  curl -o $installPth/$fileUpdate https://raw.githubusercontent.com/simatec/piler-docker/main/$fileUpdate
+  #curl -o $installPth/$fileUpdate https://raw.githubusercontent.com/simatec/piler-docker/main/$fileUpdate
+  wget https://raw.githubusercontent.com/simatec/piler-docker/main/$fileUpdate -O $installPth/$fileUpdate
   echo "${purple}${HLINE}${HLINE_SMALL}${normal}"
   echo
 done
@@ -144,7 +146,8 @@ for buildUpdate in start.sh build.sh Dockerfile build.conf; do
   echo
   echo "${purple}${HLINE}${HLINE_SMALL}"
   echo "${purple}****** Download Update $buildUpdate ******"
-  curl -o $buildPth/$buildUpdate https://raw.githubusercontent.com/simatec/piler-docker/main/build/$buildUpdate
+  #curl -o $buildPth/$buildUpdate https://raw.githubusercontent.com/simatec/piler-docker/main/build/$buildUpdate
+  wget https://raw.githubusercontent.com/simatec/piler-docker/main/build/$buildUpdate -O $buildPth/$buildUpdate
   echo "${purple}${HLINE}${HLINE_SMALL}${normal}"
   echo
 done