docker: add single-image dockerization through submodule

Author: j4n

.github/workflows/test-and-deploy-ipv4only.yaml

@@ -27,6 +27,8 @@ jobs:
       image: ${{ steps.image-ref.outputs.image }}
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -83,6 +85,8 @@ jobs:
     concurrency: staging-ipv4.testrun.org
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: prepare SSH
         run: |

.github/workflows/test-and-deploy.yaml

@@ -27,6 +27,8 @@ jobs:
       image: ${{ steps.image-ref.outputs.image }}
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -83,6 +85,8 @@ jobs:
     concurrency: staging2.testrun.org
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: prepare SSH
         run: |

.gitignore

@@ -168,5 +168,3 @@ chatmail.zone
 # docker
 /data/
 /custom/
-docker/docker-compose.override.yaml
-docker/.env

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "docker"]
+	path = docker
+	url = git@github.com:chatmail/docker.git

doc/source/docker.rst

@@ -58,13 +58,13 @@ Either:
 - Create a service directory and download the compose files::
 
     mkdir -p /srv/chatmail-relay && cd /srv/chatmail-relay
-    wget https://raw.githubusercontent.com/chatmail/relay/refs/heads/main/docker/docker-compose.yaml
-    wget https://raw.githubusercontent.com/chatmail/relay/refs/heads/main/docker/docker-compose.override.yaml.example -O docker-compose.override.yaml
+    wget https://raw.githubusercontent.com/deltachat/docker/refs/heads/main/docker-compose.yaml
+    wget https://raw.githubusercontent.com/deltachat/docker/refs/heads/main/docker-compose.override.yaml.example -O docker-compose.override.yaml
 
-- or clone the chatmail repo and enter the docker directory::
+- or clone the docker repo directly::
 
-   git clone https://github.com/chatmail/relay
-   cd relay/docker
+   git clone https://github.com/deltachat/docker
+   cd docker
 
 
 Customize and start
@@ -231,9 +231,9 @@ switch to Docker:
 Building the image
 ------------------
 
-Clone the repository and build the Docker image::
+Clone the repository (including the docker submodule) and build the Docker image::
 
-    git clone https://github.com/chatmail/relay
+    git clone --recurse-submodules https://github.com/chatmail/relay
     cd relay
     docker/build.sh