Merge pull request 'fix: bump alpine 3.24, dynamic python paths, tini via apk' (#21) from fix/alpine-3.24-and-patch-cleanup into master

Reviewed-on: #21

.gitea/workflows/cron.yaml

@@ -1 +1,49 @@
-bmFtZTogTmlnaHRseSBSZWJ1aWxkCm9uOgogIHNjaGVkdWxlOgogICAgLSBjcm9uOiAnMCAwICogKiAqJwpqb2JzOgogIGhhZG9saW50OgogICAgcnVucy1vbjogdWJ1bnR1LWxhdGVzdAogICAgc3RlcHM6CiAgICAgIC0gdXNlczogYWN0aW9ucy9jaGVja291dEBkZjRjYjFjMDY5ZTE4NzRlZGQzMWI0MzExZjE4ODQxNzJjZWMwZTEwICMgdjYKICAgICAgLSB1c2VzOiBoYWRvbGludC9oYWRvbGludC1hY3Rpb25AMjMzMmE3Yjc0YTZkZTBkZGEyZTIyMjFkNTc1MTYyZWJhNzZiYTVlNSAjIHYzLjMuMAogICAgICAgIGNvbnRpbnVlLW9uLWVycm9yOiB0cnVlCiAgICAgICAgd2l0aDoKICAgICAgICAgIGRvY2tlcmZpbGU6IERvY2tlcmZpbGUKICB0ZXN0OgogICAgcnVucy1vbjogdWJ1bnR1LWxhdGVzdAogICAgc3RlcHM6CiAgICAgIC0gdXNlczogYWN0aW9ucy9jaGVja291dEBkZjRjYjFjMDY5ZTE4NzRlZGQzMWI0MzExZjE4ODQxNzJjZWMwZTEwICMgdjYKICAgICAgLSB1c2VzOiBkb2NrZXIvc2V0dXAtYnVpbGR4LWFjdGlvbkBkN2Y1ZTdmNTA5ZTQ1Y2VjNWM3NmM0ZDVhZmRkN2RlOTNkMGIzZGY1ICMgdjQKICAgICAgLSBydW46IGRvY2tlciBidWlsZCAtdCBjaS1pbWFnZToke3sgZ2l0aHViLnNoYSB9fSAuCiAgICAgIC0gcnVuOiBiYXNoIHRlc3RzL3Rlc3Quc2ggY2ktaW1hZ2U6JHt7IGdpdGh1Yi5zaGEgfX0KICBidWlsZC1wdXNoOgogICAgbmVlZHM6IFt0ZXN0XQogICAgcnVucy1vbjogdWJ1bnR1LWxhdGVzdAogICAgc3RlcHM6CiAgICAgIC0gdXNlczogYWN0aW9ucy9jaGVja291dEBkZjRjYjFjMDY5ZTE4NzRlZGQzMWI0MzExZjE4ODQxNzJjZWMwZTEwICMgdjYKICAgICAgICB3aXRoOgogICAgICAgICAgZmV0Y2gtZGVwdGg6IDAKICAgICAgLSB1c2VzOiBkb2NrZXIvc2V0dXAtYnVpbGR4LWFjdGlvbkBkN2Y1ZTdmNTA5ZTQ1Y2VjNWM3NmM0ZDVhZmRkN2RlOTNkMGIzZGY1ICMgdjQKICAgICAgLSB1c2VzOiBkb2NrZXIvbG9naW4tYWN0aW9uQDY1MDAwNmM2ZWI3ZGJhNzNhOTk1Y2MwM2IwYjJkN2Y1Y2E5MTViZWUgIyB2NAogICAgICAgIHdpdGg6CiAgICAgICAgICB1c2VybmFtZTogJHt7IHNlY3JldHMuRE9DS0VSSFVCX1VTRVJOQU1FIH19CiAgICAgICAgICBwYXNzd29yZDogJHt7IHNlY3JldHMuRE9DS0VSSFVCX1RPS0VOIH19CiAgICAgIC0gaWQ6IGdldC1sYXRlc3QtdGFnCiAgICAgICAgcnVuOiB8CiAgICAgICAgICBUQUc9JChnaXQgZGVzY3JpYmUgLS10YWdzIC0tYWJicmV2PTAgMj4vZGV2L251bGwgfHwgZWNobyAiIikKICAgICAgICAgIGVjaG8gInRhZz0kVEFHIiA+PiAkR0lUSFVCX09VVFBVVAogICAgICAtIGlkOiBtZXRhCiAgICAgICAgdXNlczogZG9ja2VyL21ldGFkYXRhLWFjdGlvbkA4MGM3ZTk0ZGQ5YjkzMTliZDVlYjdhMGUwZmU5MjkxZTIzYTJhMmU5ICMgdjYKICAgICAgICB3aXRoOgogICAgICAgICAgaW1hZ2VzOiBqY2FiaWxsb3Qvb2ZmbGluZWltYXAKICAgICAgICAgIHRhZ3M6IHwKICAgICAgICAgICAgdHlwZT1yYXcsdmFsdWU9JHt7IHN0ZXBzLmdldC1sYXRlc3QtdGFnLm91dHB1dHMudGFnIH19LWxhdGVzdCxlbmFibGU9JHt7IHN0ZXBzLmdldC1sYXRlc3QtdGFnLm91dHB1dHMudGFnICE9ICcnIH19CiAgICAgIC0gdXNlczogZG9ja2VyL2J1aWxkLXB1c2gtYWN0aW9uQGY5ZjMwNDJmN2UyNzg5NTg2NjEwZDZlOGI4NWM4ZjAzZTUxOTViYWYgIyB2Ny4yLjAKICAgICAgICB3aXRoOgogICAgICAgICAgY29udGV4dDogLgogICAgICAgICAgcHVzaDogdHJ1ZQogICAgICAgICAgdGFnczogJHt7IHN0ZXBzLm1ldGEub3V0cHV0cy50YWdzIH19CiAgICAgICAgICBsYWJlbHM6ICR7eyBzdGVwcy5tZXRhLm91dHB1dHMubGFiZWxzIH19CiAgICAgICAgICBwdWxsOiB0cnVl
+name: Nightly Rebuild
+on:
+  schedule:
+    - cron: '0 0 * * *'
+jobs:
+  hadolint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
+        continue-on-error: true
+        with:
+          dockerfile: Dockerfile
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4
+      - run: docker build -t ci-image:${{ github.sha }} .
+      - run: bash tests/test.sh ci-image:${{ github.sha }}
+  build-push:
+    needs: [test]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+        with:
+          fetch-depth: 0
+      - uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4
+      - uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - id: get-latest-tag
+        run: |
+          TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
+          echo "tag=$TAG" >> $GITHUB_OUTPUT
+      - id: meta
+        uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # v6
+        with:
+          images: jcabillot/offlineimap
+          tags: |
+            type=raw,value=${{ steps.get-latest-tag.outputs.tag }}-latest,enable=${{ steps.get-latest-tag.outputs.tag != '' }}
+      - uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          pull: true

.gitea/workflows/main.yaml

@@ -1 +1,44 @@
-bmFtZTogTWFpbiBSZWxlYXNlCm9uOgogIHB1c2g6CiAgICBicmFuY2hlczogW21hc3Rlcl0Kam9iczoKICBoYWRvbGludDoKICAgIHJ1bnMtb246IHVidW50dS1sYXRlc3QKICAgIHN0ZXBzOgogICAgICAtIHVzZXM6IGFjdGlvbnMvY2hlY2tvdXRAZGY0Y2IxYzA2OWUxODc0ZWRkMzFiNDMxMWYxODg0MTcyY2VjMGUxMCAjIHY2CiAgICAgIC0gdXNlczogaGFkb2xpbnQvaGFkb2xpbnQtYWN0aW9uQDIzMzJhN2I3NGE2ZGUwZGRhMmUyMjIxZDU3NTE2MmViYTc2YmE1ZTUgIyB2My4zLjAKICAgICAgICBjb250aW51ZS1vbi1lcnJvcjogdHJ1ZQogICAgICAgIHdpdGg6CiAgICAgICAgICBkb2NrZXJmaWxlOiBEb2NrZXJmaWxlCiAgdGVzdDoKICAgIHJ1bnMtb246IHVidW50dS1sYXRlc3QKICAgIHN0ZXBzOgogICAgICAtIHVzZXM6IGFjdGlvbnMvY2hlY2tvdXRAZGY0Y2IxYzA2OWUxODc0ZWRkMzFiNDMxMWYxODg0MTcyY2VjMGUxMCAjIHY2CiAgICAgIC0gdXNlczogZG9ja2VyL3NldHVwLWJ1aWxkeC1hY3Rpb25AZDdmNWU3ZjUwOWU0NWNlYzVjNzZjNGQ1YWZkZDdkZTkzZDBiM2RmNSAjIHY0CiAgICAgIC0gcnVuOiBkb2NrZXIgYnVpbGQgLXQgY2ktaW1hZ2U6JHt7IGdpdGh1Yi5zaGEgfX0gLgogICAgICAtIHJ1bjogYmFzaCB0ZXN0cy90ZXN0LnNoIGNpLWltYWdlOiR7eyBnaXRodWIuc2hhIH19CiAgYnVpbGQ6CiAgICBuZWVkczogW3Rlc3RdCiAgICBydW5zLW9uOiB1YnVudHUtbGF0ZXN0CiAgICBzdGVwczoKICAgICAgLSB1c2VzOiBhY3Rpb25zL2NoZWNrb3V0QGRmNGNiMWMwNjllMTg3NGVkZDMxYjQzMTFmMTg4NDE3MmNlYzBlMTAgIyB2NgogICAgICAtIHVzZXM6IGRvY2tlci9zZXR1cC1idWlsZHgtYWN0aW9uQGQ3ZjVlN2Y1MDllNDVjZWM1Yzc2YzRkNWFmZGQ3ZGU5M2QwYjNkZjUgIyB2NAogICAgICAtIHJ1bjogZG9ja2VyIGJ1aWxkIC10IGpjYWJpbGxvdC9vZmZsaW5laW1hcDoke3sgZ2l0aHViLnNoYSB9fSAuCiAgdGFnOgogICAgbmVlZHM6IFtidWlsZF0KICAgIHJ1bnMtb246IHVidW50dS1sYXRlc3QKICAgIHN0ZXBzOgogICAgICAtIHVzZXM6IGFjdGlvbnMvY2hlY2tvdXRAZGY0Y2IxYzA2OWUxODc0ZWRkMzFiNDMxMWYxODg0MTcyY2VjMGUxMCAjIHY2CiAgICAgICAgd2l0aDoKICAgICAgICAgIGZldGNoLWRlcHRoOiAwCiAgICAgIC0gbmFtZTogQ29uZmlndXJlIGdpdCBhdXRoCiAgICAgICAgcnVuOiB8CiAgICAgICAgICBnaXQgcmVtb3RlIHNldC11cmwgb3JpZ2luICJodHRwczovL3gtYWNjZXNzLXRva2VuOiR7eyBzZWNyZXRzLlNBX1RPS0VOX0FDVElPTl9QVVNIX1RBR1MgfX1Ac2NtLmNhYmlsbG90LmV1L3BlcnNvL29mZmxpbmVpbWFwLmdpdCIKICAgICAgLSB1c2VzOiBhbm90aHJOaWNrL2dpdGh1Yi10YWctYWN0aW9uQDRlZDQ0OTY1ZTBkYjhkYWIyYjQ2NmExNmRhMDRhZWMzY2MzMTJmZDggIyB2MS43NS4wCiAgICAgICAgZW52OgogICAgICAgICAgR0lUSFVCX1RPS0VOOiAke3sgc2VjcmV0cy5TQV9UT0tFTl9BQ1RJT05fUFVTSF9UQUdTIH19CiAgICAgICAgICBERUZBVUxUX0JVTVA6IHBhdGNoCiAgICAgICAgICBSRUxFQVNFX0JSQU5DSEVTOiBtYXN0ZXIKICAgICAgICAgIFdJVEhfVjogdHJ1ZQogICAgICAgICAgR0lUX0FQSV9UQUdHSU5HOiBmYWxzZQ==
+name: Main Release
+on:
+  push:
+    branches: [master]
+jobs:
+  hadolint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
+        continue-on-error: true
+        with:
+          dockerfile: Dockerfile
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4
+      - run: docker build -t ci-image:${{ github.sha }} .
+      - run: bash tests/test.sh ci-image:${{ github.sha }}
+  build:
+    needs: [test]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4
+      - run: docker build -t jcabillot/offlineimap:${{ github.sha }} .
+  tag:
+    needs: [build]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+        with:
+          fetch-depth: 0
+      - name: Configure git auth
+        run: |
+          git remote set-url origin "https://x-access-token:${{ secrets.SA_TOKEN_ACTION_PUSH_TAGS }}@scm.cabillot.eu/perso/offlineimap.git"
+      - uses: anothrNick/github-tag-action@4ed44965e0db8dab2b466a16da04aec3cc312fd8 # v1.75.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.SA_TOKEN_ACTION_PUSH_TAGS }}
+          DEFAULT_BUMP: patch
+          RELEASE_BRANCHES: master
+          WITH_V: true
+          GIT_API_TAGGING: false

.gitea/workflows/pr.yaml

@@ -6,7 +6,7 @@ jobs:
   hadolint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
       - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
         continue-on-error: true
         with:
@@ -14,7 +14,7 @@ jobs:
   build-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-      - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
+      - uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4
       - run: docker build -t ci-image:${{ github.sha }} .
       - run: bash tests/test.sh ci-image:${{ github.sha }}

.gitea/workflows/tag.yaml

@@ -1 +1,44 @@
-bmFtZTogVGFnIFJlbGVhc2UKb246CiAgcHVzaDoKICAgIHRhZ3M6IFsnKiddCmpvYnM6CiAgaGFkb2xpbnQ6CiAgICBydW5zLW9uOiB1YnVudHUtbGF0ZXN0CiAgICBzdGVwczoKICAgICAgLSB1c2VzOiBhY3Rpb25zL2NoZWNrb3V0QGRmNGNiMWMwNjllMTg3NGVkZDMxYjQzMTFmMTg4NDE3MmNlYzBlMTAgIyB2NgogICAgICAtIHVzZXM6IGhhZG9saW50L2hhZG9saW50LWFjdGlvbkAyMzMyYTdiNzRhNmRlMGRkYTJlMjIyMWQ1NzUxNjJlYmE3NmJhNWU1ICMgdjMuMy4wCiAgICAgICAgY29udGludWUtb24tZXJyb3I6IHRydWUKICAgICAgICB3aXRoOgogICAgICAgICAgZG9ja2VyZmlsZTogRG9ja2VyZmlsZQogIHRlc3Q6CiAgICBydW5zLW9uOiB1YnVudHUtbGF0ZXN0CiAgICBzdGVwczoKICAgICAgLSB1c2VzOiBhY3Rpb25zL2NoZWNrb3V0QGRmNGNiMWMwNjllMTg3NGVkZDMxYjQzMTFmMTg4NDE3MmNlYzBlMTAgIyB2NgogICAgICAtIHVzZXM6IGRvY2tlci9zZXR1cC1idWlsZHgtYWN0aW9uQGQ3ZjVlN2Y1MDllNDVjZWM1Yzc2YzRkNWFmZGQ3ZGU5M2QwYjNkZjUgIyB2NAogICAgICAtIHJ1bjogZG9ja2VyIGJ1aWxkIC10IGNpLWltYWdlOiR7eyBnaXRodWIuc2hhIH19IC4KICAgICAgLSBydW46IGJhc2ggdGVzdHMvdGVzdC5zaCBjaS1pbWFnZToke3sgZ2l0aHViLnNoYSB9fQogIGJ1aWxkLXB1c2g6CiAgICBuZWVkczogW3Rlc3RdCiAgICBydW5zLW9uOiB1YnVudHUtbGF0ZXN0CiAgICBzdGVwczoKICAgICAgLSB1c2VzOiBhY3Rpb25zL2NoZWNrb3V0QGRmNGNiMWMwNjllMTg3NGVkZDMxYjQzMTFmMTg4NDE3MmNlYzBlMTAgIyB2NgogICAgICAtIHVzZXM6IGRvY2tlci9zZXR1cC1idWlsZHgtYWN0aW9uQGQ3ZjVlN2Y1MDllNDVjZWM1Yzc2YzRkNWFmZGQ3ZGU5M2QwYjNkZjUgIyB2NAogICAgICAtIHVzZXM6IGRvY2tlci9sb2dpbi1hY3Rpb25ANjUwMDA2YzZlYjdkYmE3M2E5OTVjYzAzYjBiMmQ3ZjVjYTkxNWJlZSAjIHY0CiAgICAgICAgd2l0aDoKICAgICAgICAgIHVzZXJuYW1lOiAke3sgc2VjcmV0cy5ET0NLRVJIVUJfVVNFUk5BTUUgfX0KICAgICAgICAgIHBhc3N3b3JkOiAke3sgc2VjcmV0cy5ET0NLRVJIVUJfVE9LRU4gfX0KICAgICAgLSBpZDogbWV0YQogICAgICAgIHVzZXM6IGRvY2tlci9tZXRhZGF0YS1hY3Rpb25AODBjN2U5NGRkOWI5MzE5YmQ1ZWI3YTBlMGZlOTI5MWUyM2EyYTJlOSAjIHY2CiAgICAgICAgd2l0aDoKICAgICAgICAgIGltYWdlczogamNhYmlsbG90L29mZmxpbmVpbWFwCiAgICAgICAgICB0YWdzOiB8CiAgICAgICAgICAgIHR5cGU9cmVmLGV2ZW50PXRhZwogICAgICAgICAgICB0eXBlPXJlZixldmVudD10YWcsc3VmZml4PS1sYXRlc3QKICAgICAgLSB1c2VzOiBkb2NrZXIvYnVpbGQtcHVzaC1hY3Rpb25AZjlmMzA0MmY3ZTI3ODk1ODY2MTBkNmU4Yjg1YzhmMDNlNTE5NWJhZiAjIHY3LjIuMAogICAgICAgIHdpdGg6CiAgICAgICAgICBjb250ZXh0OiAuCiAgICAgICAgICBwdXNoOiB0cnVlCiAgICAgICAgICB0YWdzOiAke3sgc3RlcHMubWV0YS5vdXRwdXRzLnRhZ3MgfX0KICAgICAgICAgIGxhYmVsczogJHt7IHN0ZXBzLm1ldGEub3V0cHV0cy5sYWJlbHMgfX0KICAgICAgICAgIHB1bGw6IHRydWU=
+name: Tag Release
+on:
+  push:
+    tags: ['*']
+jobs:
+  hadolint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
+        continue-on-error: true
+        with:
+          dockerfile: Dockerfile
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4
+      - run: docker build -t ci-image:${{ github.sha }} .
+      - run: bash tests/test.sh ci-image:${{ github.sha }}
+  build-push:
+    needs: [test]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4
+      - uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - id: meta
+        uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # v6
+        with:
+          images: jcabillot/offlineimap
+          tags: |
+            type=ref,event=tag
+            type=ref,event=tag,suffix=-latest
+      - uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          pull: true

Dockerfile

@@ -1,27 +1,21 @@
-FROM alpine:3.23
+FROM alpine:3.24
 LABEL maintainer="Cabillot Julien <dockerimages@cabillot.eu>"
 
 COPY entrypoint.sh /entrypoint.sh
 COPY patch.py /tmp/patch.py
 
 # hadolint ignore=DL3018
-RUN apk add --no-cache offlineimap openssl && \
+RUN apk add --no-cache offlineimap openssl tini && \
     adduser -D offlineimap && \
-    # Force SECLEVEL=1 in imaplib2 to allow connecting to servers with weak DH keys (DH_KEY_TOO_SMALL)
+    # Apply post-install patches:
-    # This is required because OpenSSL 3.x in Alpine 3.23 defaults to SECLEVEL=2
+    #   - UnicodeEncodeError fallback for defective messages (Maildir + IMAP)
-    sed -i 's/ctx = ssl.SSLContext(ssl_version)/ctx = ssl.SSLContext(ssl_version)\n                ctx.set_ciphers("DEFAULT:@SECLEVEL=1")/' /usr/lib/python3.*/site-packages/imaplib2/imaplib2.py && \
+    #   - SSL SECLEVEL=1 in imaplib2 to allow connecting to servers with weak DH keys
-    # Patch offlineimap email generator bug for defective messages
+    #     (OpenSSL 3.x defaults to SECLEVEL=2)
     python3 /tmp/patch.py && rm /tmp/patch.py
 
 COPY --chown=offlineimap offlineimaprc.*.tmpl /home/offlineimap/
 
-# Add Tini
-ENV "TINI_VERSION" "v0.16.1"
-#ADD "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" "/tini"
-#RUN chmod +x "/tini"
-#ENTRYPOINT ["/tini", "--"]
-
 USER "offlineimap"
 
-#ENTRYPOINT [ "/entrypoint.sh" ]
+ENTRYPOINT ["/sbin/tini", "--"]
-CMD [ "/entrypoint.sh" ]
+CMD [ "/entrypoint.sh" ]

patch.py

@@ -1,16 +1,52 @@
-import sys, os
+#!/usr/bin/env python3
+"""Post-install patches for offlineimap on Alpine.
+
+Run as root in the Docker build (RUN python3 /tmp/patch.py).
+Fixes two upstream issues that persist in offlineimap 8.0.0:
+
+1. UnicodeEncodeError when writing messages with non-ASCII bytes
+   (Maildir.save thread + IMAP header generation).
+2. SSL SECLEVEL=2 in OpenSSL 3.x prevents connecting to servers with
+   weak DH keys (DH_KEY_TOO_SMALL). Force SECLEVEL=1 in imaplib2.
+
+Paths are resolved dynamically so the patch survives Python version
+bumps across Alpine releases (was hardcoded to python3.12).
+"""
+
+import glob
+import sys
+
+# ---------------------------------------------------------------
+# 1. Maildir.py — wrap fd.write(msg.as_bytes(...)) in a try/except
+#    that falls back to UTF-8 encoded as_string on UnicodeEncodeError
+# ---------------------------------------------------------------
+
+maildir_path = glob.glob(
+    "/usr/lib/python%d.%d/site-packages/offlineimap/folder/Maildir.py"
+    % (sys.version_info.major, sys.version_info.minor)
+)[0]
 
-maildir_path = "/usr/lib/python3.12/site-packages/offlineimap/folder/Maildir.py"
 with open(maildir_path, "r") as f:
     maildir = f.read()
+
 maildir = maildir.replace(
     "fd.write(msg.as_bytes(policy=output_policy))",
-    "try:\n            fd.write(msg.as_bytes(policy=output_policy))\n        except UnicodeEncodeError:\n            fd.write(msg.as_string(policy=output_policy).encode('utf-8'))"
+    "try:\n            fd.write(msg.as_bytes(policy=output_policy))\n        except UnicodeEncodeError:\n            fd.write(msg.as_string(policy=output_policy).encode('utf-8'))",
 )
+
 with open(maildir_path, "w") as f:
     f.write(maildir)
 
-imap_path = "/usr/lib/python3.12/site-packages/offlineimap/folder/IMAP.py"
+# ---------------------------------------------------------------
+# 2. IMAP.py — add a helper and replace msg.as_bytes(policy=...) calls
+#    with the helper that falls back on UnicodeEncodeError
+# ---------------------------------------------------------------
+
+imap_path = glob.glob(
+    "/usr/lib/python%d.%d/site-packages/offlineimap/folder/IMAP.py"
+    % (sys.version_info.major, sys.version_info.minor)
+)[0]
+
 with open(imap_path, "r") as f:
     imap_py = f.read()
 
@@ -21,6 +57,40 @@ def get_msg_bytes(msg, policy):
     except UnicodeEncodeError:
         return msg.as_string(policy=policy).encode('utf-8')
 """
-imap_py = imap_patch + imap_py.replace("msg.as_bytes(policy=output_policy)", "get_msg_bytes(msg, output_policy)")
+imap_py = imap_patch + imap_py.replace(
+    "msg.as_bytes(policy=output_policy)", "get_msg_bytes(msg, output_policy)"
+)
+
 with open(imap_path, "w") as f:
     f.write(imap_py)
+
+# ---------------------------------------------------------------
+# 3. imaplib2.py — force SECLEVEL=1 to allow weak DH keys
+#    (moved here from a sed one-liner in the Dockerfile)
+# ---------------------------------------------------------------
+
+imaplib2_paths = glob.glob(
+    "/usr/lib/python%d.%d/site-packages/imaplib2/imaplib2.py"
+    % (sys.version_info.major, sys.version_info.minor)
+)
+
+if imaplib2_paths:
+    imaplib2_path = imaplib2_paths[0]
+    with open(imaplib2_path, "r") as f:
+        imaplib2_py = f.read()
+
+    old = "ctx = ssl.SSLContext(ssl_version)"
+    new = (
+        'ctx = ssl.SSLContext(ssl_version)\n'
+        '                ctx.set_ciphers("DEFAULT:@SECLEVEL=1")'
+    )
+
+    if old in imaplib2_py:
+        imaplib2_py = imaplib2_py.replace(old, new)
+        with open(imaplib2_path, "w") as f:
+            f.write(imaplib2_py)
+        print("Patched imaplib2 SECLEVEL=1")
+    else:
+        print("imaplib2 already patched or pattern not found — skipping")
+else:
+    print("imaplib2 not found — skipping SECLEVEL patch")