From 420afa53f88988b1bd533deb2eed81c8b25e2ae1 Mon Sep 17 00:00:00 2001
From: Florent Daigniere <nextgens@freenetproject.org>
Date: Mon, 5 Jul 2021 15:50:49 +0200
Subject: [PATCH 01/10] Upgrade to alpine 3.14

---
 core/admin/Dockerfile          | 2 +-
 core/dovecot/Dockerfile        | 2 +-
 core/nginx/Dockerfile          | 2 +-
 core/none/Dockerfile           | 2 +-
 core/postfix/Dockerfile        | 2 +-
 core/rspamd/Dockerfile         | 2 +-
 docs/Dockerfile                | 2 +-
 optional/clamav/Dockerfile     | 2 +-
 optional/fetchmail/Dockerfile  | 2 +-
 optional/postgresql/Dockerfile | 2 +-
 optional/radicale/Dockerfile   | 2 +-
 optional/unbound/Dockerfile    | 2 +-
 setup/Dockerfile               | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/core/admin/Dockerfile b/core/admin/Dockerfile
index f3b8643c..3153bd9e 100644
--- a/core/admin/Dockerfile
+++ b/core/admin/Dockerfile
@@ -1,5 +1,5 @@
 # First stage to build assets
-ARG DISTRO=alpine:3.12
+ARG DISTRO=alpine:3.14
 ARG ARCH=""
 FROM ${ARCH}node:8 as assets
 COPY --from=balenalib/rpi-alpine:3.10 /usr/bin/qemu-arm-static /usr/bin/qemu-arm-static
diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile
index e1c20eff..22145bde 100644
--- a/core/dovecot/Dockerfile
+++ b/core/dovecot/Dockerfile
@@ -1,4 +1,4 @@
-ARG DISTRO=alpine:3.13
+ARG DISTRO=alpine:3.14
 FROM $DISTRO as builder
 WORKDIR /tmp
 RUN apk add git build-base automake autoconf libtool dovecot-dev xapian-core-dev icu-dev
diff --git a/core/nginx/Dockerfile b/core/nginx/Dockerfile
index 2bc1cfd1..1906ed31 100644
--- a/core/nginx/Dockerfile
+++ b/core/nginx/Dockerfile
@@ -1,4 +1,4 @@
-ARG DISTRO=alpine:3.12
+ARG DISTRO=alpine:3.14
 FROM $DISTRO
 # python3 shared with most images
 RUN apk add --no-cache \
diff --git a/core/none/Dockerfile b/core/none/Dockerfile
index 70041dac..51b8d1c5 100644
--- a/core/none/Dockerfile
+++ b/core/none/Dockerfile
@@ -1,6 +1,6 @@
 # This is an idle image to dynamically replace any component if disabled.
 
-ARG DISTRO=alpine:3.12
+ARG DISTRO=alpine:3.14
 FROM $DISTRO
 
 CMD sleep 1000000d
diff --git a/core/postfix/Dockerfile b/core/postfix/Dockerfile
index af29bf91..939feb9c 100644
--- a/core/postfix/Dockerfile
+++ b/core/postfix/Dockerfile
@@ -1,4 +1,4 @@
-ARG DISTRO=alpine:3.12
+ARG DISTRO=alpine:3.14
 FROM $DISTRO
 # python3 shared with most images
 RUN apk add --no-cache \
diff --git a/core/rspamd/Dockerfile b/core/rspamd/Dockerfile
index acaf074e..6706ef14 100644
--- a/core/rspamd/Dockerfile
+++ b/core/rspamd/Dockerfile
@@ -1,4 +1,4 @@
-ARG DISTRO=alpine:3.12
+ARG DISTRO=alpine:3.14
 FROM $DISTRO
 # python3 shared with most images
 RUN apk add --no-cache \
diff --git a/docs/Dockerfile b/docs/Dockerfile
index 70c9c3c4..11f66b49 100644
--- a/docs/Dockerfile
+++ b/docs/Dockerfile
@@ -1,4 +1,4 @@
-ARG DISTRO=alpine:3.8
+ARG DISTRO=alpine:3.14
 FROM $DISTRO
 
 COPY requirements.txt /requirements.txt
diff --git a/optional/clamav/Dockerfile b/optional/clamav/Dockerfile
index 1132845f..20cebcdc 100644
--- a/optional/clamav/Dockerfile
+++ b/optional/clamav/Dockerfile
@@ -1,4 +1,4 @@
-ARG DISTRO=alpine:3.12
+ARG DISTRO=alpine:3.14
 FROM $DISTRO
 # python3 shared with most images
 RUN apk add --no-cache \
diff --git a/optional/fetchmail/Dockerfile b/optional/fetchmail/Dockerfile
index a707a54a..506e409a 100644
--- a/optional/fetchmail/Dockerfile
+++ b/optional/fetchmail/Dockerfile
@@ -1,4 +1,4 @@
-ARG DISTRO=alpine:3.12
+ARG DISTRO=alpine:3.14
 FROM $DISTRO
 
 # python3 shared with most images
diff --git a/optional/postgresql/Dockerfile b/optional/postgresql/Dockerfile
index ff25a66f..9c6558b9 100644
--- a/optional/postgresql/Dockerfile
+++ b/optional/postgresql/Dockerfile
@@ -1,4 +1,4 @@
-ARG DISTRO=alpine:3.12
+ARG DISTRO=alpine:3.14
 FROM $DISTRO
 # python3 shared with most images
 RUN apk add --no-cache \
diff --git a/optional/radicale/Dockerfile b/optional/radicale/Dockerfile
index 400b1a3f..13761164 100644
--- a/optional/radicale/Dockerfile
+++ b/optional/radicale/Dockerfile
@@ -1,4 +1,4 @@
-ARG DISTRO=alpine:3.12
+ARG DISTRO=alpine:3.14
 FROM $DISTRO
 
 # python3 shared with most images
diff --git a/optional/unbound/Dockerfile b/optional/unbound/Dockerfile
index abb45420..2b472d44 100644
--- a/optional/unbound/Dockerfile
+++ b/optional/unbound/Dockerfile
@@ -1,4 +1,4 @@
-ARG DISTRO=alpine:3.12
+ARG DISTRO=alpine:3.14
 FROM $DISTRO
 # python3 shared with most images
 RUN apk add --no-cache \
diff --git a/setup/Dockerfile b/setup/Dockerfile
index 2b3c3c6c..5775ab6b 100644
--- a/setup/Dockerfile
+++ b/setup/Dockerfile
@@ -1,4 +1,4 @@
-ARG DISTRO=alpine:3.10
+ARG DISTRO=alpine:3.14
 FROM $DISTRO
 
 RUN mkdir -p /app

From 0211c06c37fc466291877d1bf064d252f8b5bb7f Mon Sep 17 00:00:00 2001
From: Florent Daigniere <nextgens@freenetproject.org>
Date: Mon, 5 Jul 2021 15:54:04 +0200
Subject: [PATCH 02/10] don't need sudo here

---
 optional/postgresql/Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/optional/postgresql/Dockerfile b/optional/postgresql/Dockerfile
index 9c6558b9..0f5034da 100644
--- a/optional/postgresql/Dockerfile
+++ b/optional/postgresql/Dockerfile
@@ -3,7 +3,6 @@ FROM $DISTRO
 # python3 shared with most images
 RUN apk add --no-cache \
     python3 py3-pip bash py3-multidict \
-  && apk add --upgrade sudo \
   && pip3 install --upgrade pip
 
 # Shared layer between nginx, dovecot, postfix, postgresql, rspamd, unbound, rainloop, roundcube

From 72735ab320cd2b0b9164fefcd16620ba2032cb2c Mon Sep 17 00:00:00 2001
From: Florent Daigniere <nextgens@freenetproject.org>
Date: Mon, 5 Jul 2021 17:08:05 +0200
Subject: [PATCH 03/10] remove cyrus-sasl-plain

---
 core/postfix/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/postfix/Dockerfile b/core/postfix/Dockerfile
index 939feb9c..062155c1 100644
--- a/core/postfix/Dockerfile
+++ b/core/postfix/Dockerfile
@@ -12,7 +12,7 @@ RUN pip3 install socrate==0.2.0
 RUN pip3 install "podop>0.2.5"
 
 # Image specific layers under this line
-RUN apk add --no-cache postfix postfix-pcre cyrus-sasl-plain cyrus-sasl-login
+RUN apk add --no-cache postfix postfix-pcre cyrus-sasl-login
 
 COPY conf /conf
 COPY start.py /start.py

From 474e5aa5278ee2f924e820867e0febf5636ba0c3 Mon Sep 17 00:00:00 2001
From: Florent Daigniere <nextgens@freenetproject.org>
Date: Mon, 5 Jul 2021 17:11:09 +0200
Subject: [PATCH 04/10] document

---
 towncrier/newsfragments/1851.feature | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 towncrier/newsfragments/1851.feature

diff --git a/towncrier/newsfragments/1851.feature b/towncrier/newsfragments/1851.feature
new file mode 100644
index 00000000..e01f5cb4
--- /dev/null
+++ b/towncrier/newsfragments/1851.feature
@@ -0,0 +1 @@
+Remove cyrus-sasl-plain as it's not packaged by alpine anymore. SASL-login is still available and used when relaying.

From 64bf75efb1d97771bf7cb8ad5319d0c130b2605a Mon Sep 17 00:00:00 2001
From: Diman0 <diman@huisman.xyz>
Date: Wed, 21 Jul 2021 12:18:14 +0200
Subject: [PATCH 05/10] Added missing extension in conf.py. Added missing
 library in requirements.txt. Sphinx is only compatible with docutils<0.17

---
 docs/conf.py          | 2 +-
 docs/requirements.txt | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index 6b19f967..8f174b64 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -4,7 +4,7 @@
 
 import os
 
-extensions = ['sphinx.ext.imgmath', 'sphinx.ext.viewcode']
+extensions = ['sphinx.ext.imgmath', 'sphinx.ext.viewcode', 'sphinx_rtd_theme']
 templates_path = ['_templates']
 source_suffix = '.rst'
 master_doc = 'index'
diff --git a/docs/requirements.txt b/docs/requirements.txt
index 4afd9bb6..f49e26d5 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -2,3 +2,4 @@ recommonmark
 Sphinx
 sphinx-autobuild
 sphinx-rtd-theme
+docutils==0.16

From f8362d04e4d46c44ab07beffb77cdd041af193c0 Mon Sep 17 00:00:00 2001
From: Florent Daigniere <nextgens@freenetproject.org>
Date: Tue, 3 Aug 2021 13:44:56 +0200
Subject: [PATCH 06/10] Switch to openssl to workaround alpine #12763

---
 core/admin/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/admin/Dockerfile b/core/admin/Dockerfile
index 3153bd9e..a0d3d996 100644
--- a/core/admin/Dockerfile
+++ b/core/admin/Dockerfile
@@ -24,9 +24,9 @@ RUN mkdir -p /app
 WORKDIR /app
 
 COPY requirements-prod.txt requirements.txt
-RUN apk add --no-cache libressl curl postgresql-libs mariadb-connector-c \
+RUN apk add --no-cache openssl curl postgresql-libs mariadb-connector-c \
   && apk add --no-cache --virtual build-dep \
-  libressl-dev libffi-dev python3-dev build-base postgresql-dev mariadb-connector-c-dev \
+  openssl-dev libffi-dev python3-dev build-base postgresql-dev mariadb-connector-c-dev \
   && pip3 install -r requirements.txt \
   && apk del --no-cache build-dep
 

From defea3258ddd3faa15563630b7a10625b5ffa4a6 Mon Sep 17 00:00:00 2001
From: Florent Daigniere <nextgens@freenetproject.org>
Date: Tue, 3 Aug 2021 13:58:54 +0200
Subject: [PATCH 07/10] update arm builds too

---
 core/admin/Dockerfile         | 2 +-
 webmails/rainloop/Dockerfile  | 2 +-
 webmails/roundcube/Dockerfile | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/admin/Dockerfile b/core/admin/Dockerfile
index 0a3b8468..97cf1736 100644
--- a/core/admin/Dockerfile
+++ b/core/admin/Dockerfile
@@ -2,7 +2,7 @@
 ARG DISTRO=alpine:3.14
 ARG ARCH=""
 FROM ${ARCH}node:8 as assets
-COPY --from=balenalib/rpi-alpine:3.10 /usr/bin/qemu-arm-static /usr/bin/qemu-arm-static
+COPY --from=balenalib/rpi-alpine:3.14 /usr/bin/qemu-arm-static /usr/bin/qemu-arm-static
 
 COPY package.json ./
 RUN npm install
diff --git a/webmails/rainloop/Dockerfile b/webmails/rainloop/Dockerfile
index 9c65f277..9814413d 100644
--- a/webmails/rainloop/Dockerfile
+++ b/webmails/rainloop/Dockerfile
@@ -3,7 +3,7 @@ ARG QEMU=other
 
 # NOTE: only add file if building for arm
 FROM ${ARCH}php:7.4-apache as build_arm
-ONBUILD COPY --from=balenalib/rpi-alpine:3.10 /usr/bin/qemu-arm-static /usr/bin/qemu-arm-static
+ONBUILD COPY --from=balenalib/rpi-alpine:3.14 /usr/bin/qemu-arm-static /usr/bin/qemu-arm-static
 
 FROM ${ARCH}php:7.4-apache as build_other
 
diff --git a/webmails/roundcube/Dockerfile b/webmails/roundcube/Dockerfile
index fae02ce0..4d3e36df 100644
--- a/webmails/roundcube/Dockerfile
+++ b/webmails/roundcube/Dockerfile
@@ -2,7 +2,7 @@
 ARG ARCH=""
 ARG QEMU=other
 FROM ${ARCH}php:7.4-apache as build_arm
-ONBUILD COPY --from=balenalib/rpi-alpine:3.10 /usr/bin/qemu-arm-static /usr/bin/qemu-arm-static
+ONBUILD COPY --from=balenalib/rpi-alpine:3.14 /usr/bin/qemu-arm-static /usr/bin/qemu-arm-static
 
 FROM ${ARCH}php:7.4-apache as build_other
 

From ccb3631622e535c902d22c7ced649cd374d1ac97 Mon Sep 17 00:00:00 2001
From: Florent Daigniere <nextgens@freenetproject.org>
Date: Tue, 3 Aug 2021 14:01:44 +0200
Subject: [PATCH 08/10] still need pip3

---
 docs/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Dockerfile b/docs/Dockerfile
index 11f66b49..29234b19 100644
--- a/docs/Dockerfile
+++ b/docs/Dockerfile
@@ -6,7 +6,7 @@ COPY requirements.txt /requirements.txt
 ARG version=master
 ENV VERSION=$version
 
-RUN apk add --no-cache nginx curl python3 \
+RUN apk add --no-cache nginx curl python3 py3-pip \
  && pip3 install -r /requirements.txt \
  && mkdir /run/nginx
 

From 2b63280f59658ca05fd5fb3870126556d6c29004 Mon Sep 17 00:00:00 2001
From: Florent Daigniere <nextgens@freenetproject.org>
Date: Tue, 3 Aug 2021 14:16:14 +0200
Subject: [PATCH 09/10] doh

---
 docs/Dockerfile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/Dockerfile b/docs/Dockerfile
index 29234b19..253c8420 100644
--- a/docs/Dockerfile
+++ b/docs/Dockerfile
@@ -1,4 +1,4 @@
-ARG DISTRO=alpine:3.14
+ARG DISTRO=python:3.8-alpine3.14
 FROM $DISTRO
 
 COPY requirements.txt /requirements.txt
@@ -6,9 +6,8 @@ COPY requirements.txt /requirements.txt
 ARG version=master
 ENV VERSION=$version
 
-RUN apk add --no-cache nginx curl python3 py3-pip \
- && pip3 install -r /requirements.txt \
- && mkdir /run/nginx
+RUN apk add --no-cache nginx curl \
+ && pip3 install -r /requirements.txt
 
 COPY ./nginx.conf /etc/nginx/conf.d/default.conf
 COPY . /docs

From 609e0f9f7c5b60e5db498d3b3817b41e65c116c5 Mon Sep 17 00:00:00 2001
From: Dimitri Huisman <52963853+Diman0@users.noreply.github.com>
Date: Thu, 5 Aug 2021 00:12:37 +0200
Subject: [PATCH 10/10] Env vars are not shared between jobs

---
 .github/workflows/CI.yml | 84 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 55595838..19a445b4 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -91,6 +91,20 @@ jobs:
         shell: bash
         run: |
           echo "BRANCH=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
+      - name: Derive MAILU_VERSION for branch testing
+        if: ${{ env.BRANCH == 'testing' }}
+        shell: bash
+        env:
+          COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
+        run: |
+          echo "MAILU_VERSION=pr-${COMMIT_MESSAGE//[!0-9]/}" >> $GITHUB_ENV
+      - name: Derive MAILU_VERSION for other branches than testing
+        if: ${{ env.BRANCH != 'testing' }}
+        shell: bash
+        env:
+          MAILU_BRANCH: ${{ env.BRANCH }}
+        run: |
+          echo "MAILU_VERSION=${{ env.MAILU_BRANCH }}" >> $GITHUB_ENV          
       - name: Create folder for storing images
         run: |
           sudo mkdir -p /images
@@ -124,6 +138,20 @@ jobs:
         shell: bash
         run: |
           echo "BRANCH=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
+      - name: Derive MAILU_VERSION for branch testing
+        if: ${{ env.BRANCH == 'testing' }}
+        shell: bash
+        env:
+          COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
+        run: |
+          echo "MAILU_VERSION=pr-${COMMIT_MESSAGE//[!0-9]/}" >> $GITHUB_ENV
+      - name: Derive MAILU_VERSION for other branches than testing
+        if: ${{ env.BRANCH != 'testing' }}
+        shell: bash
+        env:
+          MAILU_BRANCH: ${{ env.BRANCH }}
+        run: |
+          echo "MAILU_VERSION=${{ env.MAILU_BRANCH }}" >> $GITHUB_ENV          
       - name: Create folder for storing images
         run: |
           sudo mkdir -p /images
@@ -157,6 +185,20 @@ jobs:
         shell: bash
         run: |
           echo "BRANCH=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
+      - name: Derive MAILU_VERSION for branch testing
+        if: ${{ env.BRANCH == 'testing' }}
+        shell: bash
+        env:
+          COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
+        run: |
+          echo "MAILU_VERSION=pr-${COMMIT_MESSAGE//[!0-9]/}" >> $GITHUB_ENV
+      - name: Derive MAILU_VERSION for other branches than testing
+        if: ${{ env.BRANCH != 'testing' }}
+        shell: bash
+        env:
+          MAILU_BRANCH: ${{ env.BRANCH }}
+        run: |
+          echo "MAILU_VERSION=${{ env.MAILU_BRANCH }}" >> $GITHUB_ENV          
       - name: Create folder for storing images
         run: |
           sudo mkdir -p /images
@@ -190,6 +232,20 @@ jobs:
         shell: bash
         run: |
           echo "BRANCH=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
+      - name: Derive MAILU_VERSION for branch testing
+        if: ${{ env.BRANCH == 'testing' }}
+        shell: bash
+        env:
+          COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
+        run: |
+          echo "MAILU_VERSION=pr-${COMMIT_MESSAGE//[!0-9]/}" >> $GITHUB_ENV
+      - name: Derive MAILU_VERSION for other branches than testing
+        if: ${{ env.BRANCH != 'testing' }}
+        shell: bash
+        env:
+          MAILU_BRANCH: ${{ env.BRANCH }}
+        run: |
+          echo "MAILU_VERSION=${{ env.MAILU_BRANCH }}" >> $GITHUB_ENV          
       - name: Create folder for storing images
         run: |
           sudo mkdir -p /images
@@ -223,6 +279,20 @@ jobs:
         shell: bash
         run: |
           echo "BRANCH=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
+      - name: Derive MAILU_VERSION for branch testing
+        if: ${{ env.BRANCH == 'testing' }}
+        shell: bash
+        env:
+          COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
+        run: |
+          echo "MAILU_VERSION=pr-${COMMIT_MESSAGE//[!0-9]/}" >> $GITHUB_ENV
+      - name: Derive MAILU_VERSION for other branches than testing
+        if: ${{ env.BRANCH != 'testing' }}
+        shell: bash
+        env:
+          MAILU_BRANCH: ${{ env.BRANCH }}
+        run: |
+          echo "MAILU_VERSION=${{ env.MAILU_BRANCH }}" >> $GITHUB_ENV          
       - name: Create folder for storing images
         run: |
           sudo mkdir -p /images
@@ -256,6 +326,20 @@ jobs:
         shell: bash
         run: |
           echo "BRANCH=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
+      - name: Derive MAILU_VERSION for branch testing
+        if: ${{ env.BRANCH == 'testing' }}
+        shell: bash
+        env:
+          COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
+        run: |
+          echo "MAILU_VERSION=pr-${COMMIT_MESSAGE//[!0-9]/}" >> $GITHUB_ENV
+      - name: Derive MAILU_VERSION for other branches than testing
+        if: ${{ env.BRANCH != 'testing' }}
+        shell: bash
+        env:
+          MAILU_BRANCH: ${{ env.BRANCH }}
+        run: |
+          echo "MAILU_VERSION=${{ env.MAILU_BRANCH }}" >> $GITHUB_ENV          
       - name: Create folder for storing images
         run: |
           sudo mkdir -p /images