From 49f6dcc3fb63a8ae742c66f5ae96a0936608865f Mon Sep 17 00:00:00 2001
From: andreas <baloand@gmail.com>
Date: Wed, 15 Feb 2023 21:12:00 +0000
Subject: [PATCH] added webapp image

---
 webapp/Dockerfile | 37 ++++++++++++++++++++++++-------------
 webapp/build.sh   | 12 ++++++++----
 z-push/Dockerfile |  5 ++---
 3 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/webapp/Dockerfile b/webapp/Dockerfile
index 25674a1..9a6aa99 100644
--- a/webapp/Dockerfile
+++ b/webapp/Dockerfile
@@ -1,26 +1,37 @@
 # syntax=docker/dockerfile:1.4
 FROM ubuntu:20.04
 # install apt packages
-RUN <<EOF 
-apt-get update -y
+RUN <<EOF
 export DEBIAN_FRONTEND=noninteractive 
 export TZ=Europe/Berlin 
-apt-get install -y tzdata z-push apache2 wget
-apt-get autoclean
-rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ~/.cache ~/.npm
+apt-get update
+apt-get install -y tzdata wget gnupg apache2
 EOF
-# install kopano webapp
 RUN <<EOF
+# install php7-mapi and dependencies
+wget --no-verbose -P/tmp http://bldr/core-11.0.2.50.507cbae-Ubuntu_20.04-amd64.tar.gz 
+tar xzf /tmp/core-11.0.2.50.507cbae-Ubuntu_20.04-amd64.tar.gz
+for F in core-11.0.2.50.507cbae-Ubuntu_20.04-amd64/*.deb; do dpkg --unpack --no-triggers $F; done
+apt-get install -f -y
+# install kopano-webapp
 wget --no-verbose -P/tmp http://bldr/webapp-6.0.0.57.1049268-Ubuntu_20.04-all.tar.gz
 tar xzf /tmp/webapp-6.0.0.57.1049268-Ubuntu_20.04-all.tar.gz
-for F in ~/webapp-6.0.0.57.1049268-Ubuntu_20.04-all/*.deb; do dpkg --unpack --no-triggers $F; done
+for F in webapp-6.0.0.57.1049268-Ubuntu_20.04-all/*.deb; do dpkg --unpack --no-triggers $F; done
 apt-get install -f -y
-apt-get clean
-rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ~/.cache ~/.npm
-rm -rf ~/webapp-6.0.0.57.1049268-Ubuntu_20.04-all
 EOF
+# RUN <<EOF
+# apt-get autoclean
+# rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ~/.cache ~/.npm
+# rm -rf webapp-6.0.0.57.1049268-Ubuntu_20.04-all
+# rm -rf core-11.0.2.50.507cbae-Ubuntu_20.04-amd64
+# EOF
 # use envsubst in entrypoint script to convert config templates to actual config files
-WORKDIR /root
+RUN <<EOF
+apt-get install -y libapache2-mod-php7.4
+a2ensite kopano-webapp
+# phpenmod kopano
+# sed -i -e's/^;session.cookie_secure =/session.cookie_secure = false/' /etc/php/7.4/apache2/php.ini
+sed -i -e's/define("SECURE_COOKIES", true);/define("SECURE_COOKIES", false);/' /etc/kopano/webapp/config.php
+EOF
 EXPOSE 80
-VOLUME /var/lib/z-push
-ENTRYPOINT ["/bin/bash"]
\ No newline at end of file
+ENTRYPOINT ["/bin/bash"]
diff --git a/webapp/build.sh b/webapp/build.sh
index af69e34..e0d8b6c 100644
--- a/webapp/build.sh
+++ b/webapp/build.sh
@@ -1,11 +1,15 @@
 #!/usr/bin/bash
 # export DOCKER_BUILDKIT=1
-docker run -d --rm --name apache -p80:80 -v/root/kopano-docker/dist:/var/www httpd
-docker build -t webapp .
+docker run -d --rm --name www -p80:80 -v/root/kopano-docker/dist:/usr/local/apache2/htdocs httpd
+docker build --no-cache --progress=plain -t webapp .
 docker run --rm -it --name webapp \
+  -p8080:80 \
   -e "MAIL_DOMAIN=ads65.de" \
-  -v/root/kopano-docker/webapp/etc/apache2:/etc/apache2 \
-  -v/root/kopano-docker/webapp/etc/ssl:/etc/ssl \
+  -e "APACHE_RUN_DIR=/var/www" \
+  -e "APACHE_RUN_USER=www-data" \
+  -e "APACHE_RUN_GROUP=www-data" \
+  -e "APACHE_LOG_DIR=/var/log/apache2" \
+  -e "APACHE_PID_FILE=/var/run/apache2/apache2.pid" \
   webapp 
 docker logs -f webapp
 docker exec -it webapp bash
diff --git a/z-push/Dockerfile b/z-push/Dockerfile
index d315a72..e304f81 100644
--- a/z-push/Dockerfile
+++ b/z-push/Dockerfile
@@ -1,17 +1,16 @@
 # syntax=docker/dockerfile:1.4
 FROM ubuntu:20.04
+# install apt packages
 RUN <<EOF
 export DEBIAN_FRONTEND=noninteractive 
 export TZ=Europe/Berlin 
 apt-get update
 apt-get install -y tzdata wget gnupg
 EOF
-RUN <<EOF
-# install php7-mapi
+# install php7-mapi and dependencies
 wget --no-verbose -P/tmp http://bldr/core-11.0.2.50.507cbae-Ubuntu_20.04-amd64.tar.gz 
 tar xzf /tmp/core-11.0.2.50.507cbae-Ubuntu_20.04-amd64.tar.gz
 for F in core-11.0.2.50.507cbae-Ubuntu_20.04-amd64/*.deb; do dpkg --unpack --no-triggers $F; done
-# apt-get install -f -y
 # install z-push
 wget -qO - https://download.kopano.io/zhub/z-push:/final/Ubuntu_20.04/Release.key | apt-key add -
 echo "deb https://download.kopano.io/zhub/z-push:/final/Ubuntu_20.04/ /" >/etc/apt/sources.list.d/z-push.list