PFA 3.2.4

Author: technicalguru

Dockerfile

@@ -1,25 +1,25 @@
 FROM eu.gcr.io/long-grin-186810/rs-php:7.4.4-apache-2.4.38.0
 LABEL maintainer="Ralph Schuster <github@ralph-schuster.eu>"
 
-# PFA has a bug in 3.2 release (see below)
-RUN apt-get update &&  apt-get update && apt-get install -y --no-install-recommends \
-    patch \
-    && rm -rf /var/lib/apt/lists/*
+#RUN apt-get update &&  apt-get update && apt-get install -y --no-install-recommends \
+#    patch \
+#    && rm -rf /var/lib/apt/lists/*
 
 #ADD etc/php/ /usr/local/etc/php/conf.d/
 #ADD etc/conf/ /etc/apache2/conf-enabled/
 #ADD etc/mods/ /etc/apache2/mods-enabled/
 #ADD etc/sites/ /etc/apache2/sites-enabled/
 RUN chown -R www-data:www-data /var/www/html
 
-RUN cd /var/www/html \
-    && curl -o postfixadmin.tar.gz https://netcologne.dl.sourceforge.net/project/postfixadmin/postfixadmin/postfixadmin-3.2/postfixadmin-3.2.tar.gz \
-    && tar --strip-components=1 -xzvf postfixadmin.tar.gz \
+ENV PFA_VERSION="3.2.4"
+ENV PFA_URL="https://github.com/postfixadmin/postfixadmin/archive/postfixadmin-${PFA_VERSION}.tar.gz"
+RUN set -xe \
+    && cd /var/www/html \
+    && curl -o postfixadmin.tar.gz -L "$PFA_URL" \
+    && tar --strip-components=1 -xvf postfixadmin.tar.gz \
     && rm postfixadmin.tar.gz \
     && mkdir templates_c \
     && chown -R www-data:www-data .
 
 ADD src/    /var/www/html/
 
-# Fix the crucial bug
-RUN patch /var/www/html/model/MailboxHandler.php < /var/www/html/MailboxHandler.patch