From d8af5586efbbd3678cece33e4a2f0613b3ddb38a Mon Sep 17 00:00:00 2001
From: Andreas Balogh <baloand@gmail.com>
Date: Sun, 17 Jul 2022 19:16:02 +0000
Subject: [PATCH] optimized image layers

---
 build.sh                 |  9 ++++++
 deploy-kopano.sh         |  6 ++--
 etc-baloghs/build.sh     |  2 --
 kopano.dockerfile        | 69 ++++++++++++++++++++++++++--------------
 mysql/docker-compose.yml | 22 +++++++++++++
 5 files changed, 80 insertions(+), 28 deletions(-)
 create mode 100644 build.sh
 delete mode 100644 etc-baloghs/build.sh
 create mode 100644 mysql/docker-compose.yml

diff --git a/build.sh b/build.sh
new file mode 100644
index 0000000..84f7e35
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/bash
+DOCKER_BUILDKIT=1 docker build -f kopano.dockerfile -t kopano .
+docker container prune -f
+docker create --name kopano kopano:latest
+docker export kopano | docker import - kopano:squashed
+# docker run -d --name kopano kopano:squashed
+# docker exec -it kopano bash
+# docker stop kopano
+# docker rm kopano
\ No newline at end of file
diff --git a/deploy-kopano.sh b/deploy-kopano.sh
index 6d09b1a..d4fbcc4 100644
--- a/deploy-kopano.sh
+++ b/deploy-kopano.sh
@@ -1,6 +1,6 @@
-apt-get update -y
-DEBIAN_FRONTEND=noninteractive 
-TZ=Europe/Berlin 
+apt-get update
+export DEBIAN_FRONTEND=noninteractive 
+export TZ=Europe/Berlin 
 apt-get install -y tzdata z-push apache2
 tar xzf core-11.0.2.50.507cbae-Ubuntu_20.04-amd64.tar.gz
 tar xzf webapp-6.0.0.57.1049268-Ubuntu_20.04-all.tar.gz
diff --git a/etc-baloghs/build.sh b/etc-baloghs/build.sh
deleted file mode 100644
index dd76eb3..0000000
--- a/etc-baloghs/build.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/bash
-docker build -f kopano.dockerfile -t kopano:1 .
diff --git a/kopano.dockerfile b/kopano.dockerfile
index 7bcbd65..484ed2c 100644
--- a/kopano.dockerfile
+++ b/kopano.dockerfile
@@ -1,24 +1,47 @@
-# FROM ubuntu:20.04
-FROM tozd/runit:ubuntu-focal
-# build s6 process manager
-# build postfix
-# build postgres
-# build apache
-# build z-push
-# build kopano
-WORKDIR /root
-COPY dist/core-11.0.2.50.507cbae-Ubuntu_20.04-amd64.tar.gz .
-COPY dist/webapp-6.0.0.57.1049268-Ubuntu_20.04-all.tar.gz .
-COPY deploy-kopano.sh .
-RUN ./deploy-kopano.sh
-COPY service /etc/service
+# syntax=docker/dockerfile:1.3-labs
+FROM ubuntu:20.04
+# install apt packages
+RUN <<EOF 
+apt-get update -y
+export DEBIAN_FRONTEND=noninteractive 
+export TZ=Europe/Berlin 
+apt-get install -y tzdata z-push apache2 postfix spampd wget xz-utils
+apt-get autoclean
+EOF
+# install s6 process manager
+ADD https://github.com/just-containers/s6-overlay/releases/download/v3.1.1.2/s6-overlay-noarch.tar.xz /tmp
+ADD https://github.com/just-containers/s6-overlay/releases/download/v3.1.1.2/s6-overlay-x86_64.tar.xz /tmp
+RUN <<EOF 
+tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz
+tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz
+EOF
+COPY ./etc/s6-overlay /etc/s6-overlay
+# install kopano core
+RUN <<EOF
+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
+apt-get clean
+rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ~/.cache ~/.npm
+rm -rf ~/core-11.0.2.50.507cbae-Ubuntu_20.04-amd64
+EOF
+# install kopano webapp
+RUN <<EOF
+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
+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
 # https://documentation.kopano.io/kopanocore_administrator_manual/configure_kc_components.html#configure-kopano-dagent-for-delivery-via-unix-socket
-# declaration section
-ARG MAIL_DOMAIN=zntrl.de
-EXPOSE 80 443 
-EXPOSE 2003   
-EXPOSE 993    
-EXPOSE 8443   
-# create run scripts in etc/service
-# CMD ["/usr/sbin/kopano-server", "-F", "-c", "/etc/kopano/server.cfg"]
-ENTRYPOINT ["init.sh"]
\ No newline at end of file
+WORKDIR /root
+EXPOSE 80
+EXPOSE 993
+EXPOSE 2003
+EXPOSE 8443
+VOLUME /var/lib/kopano/attachments
+VOLUME /var/lib/z-push
+ENTRYPOINT ["/init"]
\ No newline at end of file
diff --git a/mysql/docker-compose.yml b/mysql/docker-compose.yml
new file mode 100644
index 0000000..1a253de
--- /dev/null
+++ b/mysql/docker-compose.yml
@@ -0,0 +1,22 @@
+version: '3.1'
+services:
+  db:
+    image: mysql:latest
+    container_name: mysql
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: Asdf2345
+    ports:
+      - 3307:3306
+    networks:
+      - kopano
+    volumes:
+      - ~/kopano/mysql/etc:/etc/mysql
+      - database:/var/lib/mysql
+secrets:
+   db_root_password:
+     file: db_root_password.txt
+networks:
+  - kopano
+volumes:
+  - database: