updated Dockerfiles

indimail · Jul 27, 2023 · 61eaa02 · 61eaa02
1 parent 2ccf447
commit 61eaa02
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 18 deletions.
diff --git a/indimail-src/fedora.indimail-mta.bin b/indimail-src/fedora.indimail-mta.bin
@@ -68,6 +68,7 @@ RUN export HOSTNAME=indimail.org MYSQL_SOCKET=/run/mysqld/mysqld.sock \
 			libdb-devel pam-devel krb5-devel libev-devel libsodium-devel libidn-devel \
 			libidn2-devel readline-devel tcl-devel tk-devel; \
 		dnf -y autoremove; \
+		/bin/rm -rf /run/* || true; \
 		/bin/rm -f /usr/local/srctmp/incomplete; \
 	) > /var/log/build/build.bin.log 2>&1 \
 	&& (test -f /usr/local/srctmp/incomplete && echo "Build Failed" && cat /var/log/build/build.bin.log && exit 1) || (echo "Build Succeeded" && gzip /var/log/build/build.bin.log)

diff --git a/indimail-src/fedora.indimail-web.bin b/indimail-src/fedora.indimail-web.bin
@@ -76,6 +76,7 @@ RUN export HOSTNAME=indimail.org MYSQL_SOCKET=/run/mysqld/mysqld.sock \
 			libdb-devel pam-devel krb5-devel libev-devel libsodium-devel libidn-devel \
 			libidn2-devel readline-devel tcl-devel tk-devel; \
 		dnf -y autoremove; \
+		/bin/rm -rf /run/* || true; \
 		/bin/rm -f /usr/local/srctmp/incomplete; \
 	) >/var/log/build/build.bin.log 2>&1 \
 	&& (test -f /usr/local/srctmp/incomplete && echo "Build Failed" && cat /var/log/build/build.bin.log && exit 1) || (echo "Build Succeeded" && gzip /var/log/build/build.bin.log) \

diff --git a/indimail-src/fedora.indimail.bin b/indimail-src/fedora.indimail.bin
@@ -71,6 +71,7 @@ RUN export HOSTNAME=indimail.org MYSQL_SOCKET=/run/mysqld/mysqld.sock \
 			libdb-devel pam-devel krb5-devel libev-devel libsodium-devel libidn-devel \
 			libidn2-devel readline-devel tcl-devel tk-devel; \
 		dnf -y autoremove; \
+		/bin/rm -rf /run/* || true; \
 		/bin/rm -f /usr/local/srctmp/incomplete; \
 	) > /var/log/build/build.bin.log 2>&1 \
 	&& (test -f /usr/local/srctmp/incomplete && echo "Build Failed" && cat /var/log/build/build.bin.log && exit 1) || (echo "Build Succeeded" && gzip /var/log/build/build.bin.log) \

diff --git a/indimail-src/stream8.indimail-mta.bin b/indimail-src/stream8.indimail-mta.bin
@@ -9,7 +9,6 @@ RUN export HOSTNAME=indimail.org DEBIAN_FRONTEND=noninteractive \
 	&& (set -e; \
 		dnf -y update; \
 		cd /usr/local/srctmp; \
-		cd /usr/local/srctmp; \
 		for i in libqmail indimail-mta ezmlm-idx tinydnssec indimail-virtualdomains indimail-docker; \
 			do cd $i; echo "updating $i";git pull; cd ..; done; \
 		# libqmail

diff --git a/indimail-src/stream8.indimail.bin b/indimail-src/stream8.indimail.bin
@@ -7,6 +7,7 @@ RUN export HOSTNAME=indimail.org DEBIAN_FRONTEND=noninteractive \
 	MYSQL_SOCKET=/run/mysqld/mysqld.sock \
 	&& mkdir -p /root /usr/local/srctmp /var/log/build \
 	&& (set -e; \
+		touch /usr/local/srctmp/incomplete; \
 		dnf -y update; \
 		cd /usr/local/srctmp; \
 		for i in libqmail indimail-mta ezmlm-idx tinydnssec indimail-virtualdomains indimail-docker; \
@@ -40,7 +41,8 @@ RUN export HOSTNAME=indimail.org DEBIAN_FRONTEND=noninteractive \
 		cd /usr/local/srctmp/indimail-virtualdomains; \
 		for i in indimail-x altermime-x ripmime-x mpack-x flash-x fortune-x pam-multi-x \
 			bogofilter-wordlist-x courier-imap-x indimail-spamfilter-x \
-			indium-x nssd-x fetchmail-x logalert-x procmail-x; do cd $i; ./default.configure; make && make install-strip;cd ..; done; \
+			indium-x nssd-x fetchmail-x logalert-x procmail-x; do cd $i; \
+			./default.configure; make && make install-strip;cd ..; done; \
 		# configure indimail-mta ###############################
 		cd /usr/local/srctmp/indimail-mta/indimail-mta-x; \
 		./create_services --add-boot --mbase=/home/mail --mysqlPrefix=/usr; \
@@ -75,8 +77,9 @@ RUN export HOSTNAME=indimail.org DEBIAN_FRONTEND=noninteractive \
 		dnf -y erase gcc autoconf automake make git \
 			xmlto docbook-dtds sgml-common docbook-style-xsl; \
 		/bin/rm -rf /run/* || true; \
+		/bin/rm -f /usr/local/srctmp/incomplete; \
 	) > /var/log/build/build.bin.log 2>&1 \
-	&& (echo "Build Succeeded" && gzip /var/log/build/build.bin.log) || (echo "Build Failed" && cat /var/log/build/build.bin.log && exit 1) \
+	&& (test -f /usr/local/srctmp/incomplete && echo "Build Failed" && cat /var/log/build/build.bin.log && exit 1) || (echo "Build Succeeded" && gzip /var/log/build/build.bin.log) \
 	&& (test -d /var/indimail/mysqldb/data/indimail && echo "MySQL db creation succeeded") || (echo "MySQL db creation failed" && exit 1)
 COPY .alias .bash_profile .bashrc .exrc .gfuncs .glogout .indent.pro .vimrc /root/
 VOLUME ["/sys/fs/cgroup"]

diff --git a/indimail-src/stream9.indimail-mta.bin b/indimail-src/stream9.indimail-mta.bin
@@ -1,4 +1,5 @@
 # docker build -f dockerfile.stream9 -t cprogrammer/indimail-mta:stream9
+# vim: wrap
 FROM cprogrammer/indimail-src:stream9
 MAINTAINER cprogrammer
 LABEL org.opencontainers.image.source https://github.com/mbhangui/indimail-docker
@@ -7,7 +8,6 @@ RUN export HOSTNAME=indimail.org DEBIAN_FRONTEND=noninteractive \
 	MYSQL_SOCKET=/run/mysqld/mysqld.sock \
 	&& mkdir -p /root /usr/local/srctmp /var/log/build \
 	&& (set -e; \
-		touch /usr/local/srctmp/incomplete; \
 		dnf -y update; \
 		cd /usr/local/srctmp; \
 		for i in libqmail indimail-mta ezmlm-idx tinydnssec indimail-virtualdomains indimail-docker; \
@@ -73,9 +73,8 @@ RUN export HOSTNAME=indimail.org DEBIAN_FRONTEND=noninteractive \
 		dnf -y erase gcc autoconf automake make git \
 			xmlto docbook-dtds sgml-common docbook-style-xsl; \
 		/bin/rm -rf /run/* || true; \
-		/bin/rm -f /usr/local/srctmp/incomplete; \
 	) > /var/log/build/build.bin.log 2>&1 \
-	&& (test -f /usr/local/srctmp/incomplete && echo "Build Failed" && cat /var/log/build/build.bin.log && exit 1) || (echo "Build Succeeded" && gzip /var/log/build/build.bin.log)
+	&& (echo "Build Succeeded" && gzip /var/log/build/build.bin.log) || (echo "Build Failed" && cat /var/log/build/build.bin.log && exit 1)
 COPY .alias .bash_profile .bashrc .exrc .gfuncs .glogout .indent.pro .vimrc /root/
 VOLUME ["/sys/fs/cgroup"]
 VOLUME ["/run"]

diff --git a/webmail/leap15.4/Dockerfile b/webmail/leap15.4/Dockerfile
@@ -53,21 +53,24 @@ RUN export HOSTNAME=indimail.org \
 		iwebadmin \
 		ircube \
 		apache2-mod_php7 \
-		php7-ctype \
-		php7-gd \
-		php7-imagick \
-		php7-intl \
-		php7-xmlrpc \
-		php7-zip \
-		php7-curl \
+		php-ctype \
+		php-curl \
+		php-exif \
+		php-fileinfo \
+		php-gd \
+		php-imagick \
+		php-intl \
+		php-xmlwriter \
+		php-xmlrpc \
+		php-zip \
 		roundcubemail \
 		mailx \
 	&& echo "Creating self-signed certificate" \
 	&& /usr/sbin/svctool \
 		--config=cert --postmaster=postmaster@indimail.org --common_name=indimail.org > /dev/null 2>/tmp/cert.log \
 	&& mkdir -p /var/log/build \
 	&& (cp -rp /usr/share/roundcubemail/plugins/* /srv/www/roundcubemail/plugins; \
-		systemctl disable sshd; systemctl disable mysqld; \
+		systemctl disable sshd mariadb; \
 		a2enmod php7; \
 		sed -e 's{^${LoadModule php7_module /usr/lib64/apache2-prefork/mod_php7.so{' /etc/apache2/loadmodule.conf; \
 		/usr/libexec/indimail/roundcube_config) >/var/log/build/roundcube.log 2>&1 \

diff --git a/webmail/leap15.5/Dockerfile b/webmail/leap15.5/Dockerfile
@@ -54,20 +54,23 @@ RUN export HOSTNAME=indimail.org \
 		ircube \
 		apache2-mod_php7 \
 		php7-ctype \
+		php7-curl \
+		php7-exif \
+		php7-fileinfo \
 		php7-gd \
 		php7-imagick \
 		php7-intl \
+		php-xmlwriter \
 		php7-xmlrpc \
 		php7-zip \
-		php7-curl \
 		roundcubemail \
 		mailx \
 	&& echo "Creating self-signed certificate" \
 	&& /usr/sbin/svctool \
 		--config=cert --postmaster=postmaster@indimail.org --common_name=indimail.org > /dev/null 2>/tmp/cert.log \
 	&& mkdir -p /var/log/build \
 	&& (cp -rp /usr/share/roundcubemail/plugins/* /srv/www/roundcubemail/plugins; \
-		systemctl disable sshd; systemctl disable mysqld; \
+		systemctl disable sshd mariadb; \
 		a2enmod php7; \
 		sed -e 's{^${LoadModule php7_module /usr/lib64/apache2-prefork/mod_php7.so{' /etc/apache2/loadmodule.conf; \
 		/usr/libexec/indimail/roundcube_config) >/var/log/build/roundcube.log 2>&1 \

diff --git a/webmail/tumbleweed/Dockerfile b/webmail/tumbleweed/Dockerfile
@@ -50,13 +50,25 @@ RUN export HOSTNAME=indimail.org \
 		iwebadmin \
 		ircube \
 		roundcubemail \
+		php-ctype \
+		php-curl \
+		php-exif \
+		php-fileinfo \
+		php-gd \
+		php-imagick \
+		php-intl \
+		php-xmlwriter \
+		php-zip \
 		mailx \
 	&& echo "Creating self-signed certificate" \
 	&& /usr/sbin/svctool \
 		--config=cert --postmaster=postmaster@indimail.org --common_name=indimail.org > /dev/null 2>/tmp/cert.log \
 	&& mkdir -p /var/log/build \
-	&& systemctl disable sshd mariadb \
-	&& /usr/libexec/indimail/roundcube_config >/var/log/build/roundcube.log 2>&1 \
+	&& (cp -rp /usr/share/roundcubemail/plugins/* /srv/www/roundcubemail/plugins; \
+		systemctl disable sshd mariadb; \
+		a2enmod php8; \
+		sed -e 's{^${LoadModule php_module /usr/lib64/apache2-prefork/mod_php8.so{' /etc/apache2/loadmodule.conf; \
+		/usr/libexec/indimail/roundcube_config) >/var/log/build/roundcube.log 2>&1 \
 	&& (echo "Build Succeeded" && gzip /var/log/build/roundcube.log) || (echo "Build Failed" && cat /var/log/build/roundcube.log && exit 1) \
 	&& (test -d /var/indimail/mysqldb/data/RoundCube_db && echo "RoundCube db creation succeeded") || \
 		(echo "RoundCube db creation failed" && gunzip -c /var/log/build/roundcube.log.gz && exit 1)