From b8721a79cd7cbeba1b714daffb607f2585c14f08 Mon Sep 17 00:00:00 2001
From: andreas <baloand@gmail.com>
Date: Tue, 14 Feb 2023 21:54:12 +0000
Subject: [PATCH] added z-push image

---
 build.sh          |  2 +-
 core/Dockerfile   |  2 +-
 webapp/Dockerfile |  2 +-
 webapp/build.sh   | 16 +++++++++++-----
 z-push/Dockerfile | 27 +++++++++++++++++++++++++++
 z-push/build.sh   | 26 ++++++++++++++++++++++++++
 6 files changed, 67 insertions(+), 8 deletions(-)
 create mode 100644 z-push/Dockerfile
 create mode 100644 z-push/build.sh

diff --git a/build.sh b/build.sh
index 9572229..c9c2088 100644
--- a/build.sh
+++ b/build.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/bash
-# docker run -d --name apache -p80:80 -v/root/kopano/dist:/var/www/... apache
+# docker run -d --name apache -p80:80 -v/root/kopano/dist:/usr/local/apache2/htdocs httpd
 DOCKER_BUILDKIT=1 docker build -f kopano.dockerfile -t kopano .
 docker container prune -f
 docker create --name kopano kopano:latest
diff --git a/core/Dockerfile b/core/Dockerfile
index 9b2b63a..54d8cea 100644
--- a/core/Dockerfile
+++ b/core/Dockerfile
@@ -1,6 +1,7 @@
 # syntax=docker/dockerfile:1.3-labs
 FROM ubuntu:20.04
 # install apt packages
+WORKDIR /root
 RUN <<EOF 
 apt-get update -y
 export DEBIAN_FRONTEND=noninteractive 
@@ -28,7 +29,6 @@ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ~/.cache ~/.npm
 rm -rf ~/core-11.0.2.50.507cbae-Ubuntu_20.04-amd64
 EOF
 # https://documentation.kopano.io/kopanocore_administrator_manual/configure_kc_components.html#configure-kopano-dagent-for-delivery-via-unix-socket
-WORKDIR /root
 EXPOSE 8443
 VOLUME /var/lib/kopano/attachments
 ENTRYPOINT ["/init"]
\ No newline at end of file
diff --git a/webapp/Dockerfile b/webapp/Dockerfile
index b277248..25674a1 100644
--- a/webapp/Dockerfile
+++ b/webapp/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.3-labs
+# syntax=docker/dockerfile:1.4
 FROM ubuntu:20.04
 # install apt packages
 RUN <<EOF 
diff --git a/webapp/build.sh b/webapp/build.sh
index 0358095..af69e34 100644
--- a/webapp/build.sh
+++ b/webapp/build.sh
@@ -1,10 +1,12 @@
 #!/usr/bin/bash
-# docker login --username baloan --password 'yZBCUs5&@?:.'
-docker run -d --name apache -p80:80 -v/root/kopano/dist:/var/www httpd
 # 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 tag -t webapp:latest ...
-docker run --rm -it --name webapp -e "MAIL_DOMAIN=zntrl.de" -v/root/kopano/webapp/etc/apache2:/etc/apache2 -v/root/kopano/webapp/etc/ssl:/etc/ssl webapp 
+docker run --rm -it --name webapp \
+  -e "MAIL_DOMAIN=ads65.de" \
+  -v/root/kopano-docker/webapp/etc/apache2:/etc/apache2 \
+  -v/root/kopano-docker/webapp/etc/ssl:/etc/ssl \
+  webapp 
 docker logs -f webapp
 docker exec -it webapp bash
 
@@ -14,4 +16,8 @@ docker rm webapp
 docker container ls 
 docker container prune
 docker image ls
-docker image prune -a -f
\ No newline at end of file
+docker image prune -a -f
+
+# docker login --username baloan --password 'yZBCUs5&@?:.'
+# docker tag -t webapp:latest ...
+# docker push
\ No newline at end of file
diff --git a/z-push/Dockerfile b/z-push/Dockerfile
new file mode 100644
index 0000000..d315a72
--- /dev/null
+++ b/z-push/Dockerfile
@@ -0,0 +1,27 @@
+# syntax=docker/dockerfile:1.4
+FROM ubuntu:20.04
+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
+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
+apt-get update
+apt-get install -y z-push-kopano z-push-config-apache z-push-backend-kopano
+apt-get autoclean
+rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ~/.cache ~/.npm
+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
+EXPOSE 80
+VOLUME /var/lib/z-push
+ENTRYPOINT ["/bin/bash"]
diff --git a/z-push/build.sh b/z-push/build.sh
new file mode 100644
index 0000000..eb21823
--- /dev/null
+++ b/z-push/build.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/bash
+# export DOCKER_BUILDKIT=1
+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 z-push .
+docker run --rm -it --name z-push \
+  -e "MAIL_DOMAIN=ads65.de" \
+  -e "APACHE_RUN_DIR=/var/www" \
+  -e "APACHE_RUN_USER=www-data" \
+  -e "APACHE_RUN_GROUP=www-data" \
+  -e "APACHE_LOG_DIR=/var/log" \
+  -e "APACHE_PID_FILE=/var/run/apache2/apache2.pid" \
+  z-push 
+docker logs -f z-push
+docker exec -it z-push bash
+
+docker kill z-push
+docker rm z-push
+
+docker container ls 
+docker container prune
+docker image ls
+docker image prune -a -f
+
+# docker login --username baloan --password 'yZBCUs5&@?:.'
+# docker tag -t z-push:latest ...
+# docker push
\ No newline at end of file