Merge pull request 'chore: fix Dockerfile FROM quotes, gitlabci image quotes' (#3) from chore/renovate into master

Reviewed-on: #3

.gitea/workflows/docker-build.yaml

@@ -1,46 +1,65 @@
 name: Docker Build and Push
 
 on:
-  pull_request:
-    branches: [master]
   push:
-    branches: [master]
+    branches: [master, main]
+  pull_request:
   schedule:
-    - cron: '0 0 * * *'
+    - cron: '30 3 * * 3'
 
 jobs:
-  build:
+  lint:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v6
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
+      - uses: hadolint/hadolint-action@54c9adbab1582c2ef04b2016b760714a4bfde3cf
+        with:
+          dockerfile: Dockerfile
+          failure-threshold: error
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
+  build:
+    runs-on: ubuntu-latest
+    needs: lint
+    steps:
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
+      - name: Build image
+        run: docker build -t ci-image:${{ github.sha }} .
+      - name: Save image
+        run: docker save ci-image:${{ github.sha }} -o image.tar
+      - uses: ChristopherHX/gitea-upload-artifact@62ac910c5d3dfa85c7cb2df15afe2e342b2407c2
+        with:
+          name: docker-image
+          path: image.tar
 
-      - name: Login to Docker Hub
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v4
+  test:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
+      - uses: ChristopherHX/gitea-download-artifact@75635f32b4c1c41c4b3d64e8f85210112ed4c9c7
+        with:
+          name: docker-image
+      - name: Load image
+        run: docker load < image.tar
+      - name: Run tests
+        run: bash tests/test.sh ci-image:${{ github.sha }}
+
+  push:
+    runs-on: ubuntu-latest
+    needs: test
+    if: github.event_name != 'pull_request'
+    steps:
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
+      - uses: ChristopherHX/gitea-download-artifact@75635f32b4c1c41c4b3d64e8f85210112ed4c9c7
+        with:
+          name: docker-image
+      - name: Load image
+        run: docker load < image.tar
+      - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Docker metadata
-        id: meta
-        uses: docker/metadata-action@v6
-        with:
-          images: jcabillot/offlineimap
-          tags: |
-            #type=ref,event=branch
-            #type=ref,event=pr
-            #type=sha
-            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v7
-        with:
-          context: .
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          pull: true
+      - name: Tag and push
+        run: |
+          docker tag ci-image:${{ github.sha }} jcabillot/offlineimap:latest
+          docker push jcabillot/offlineimap:latest

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: "docker:latest"
+image: docker:latest
 
 services:
   - "docker:dind"

Dockerfile

@@ -1,9 +1,10 @@
-FROM "alpine:3.23"
+FROM alpine:3.23
 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 && \
     adduser -D offlineimap && \
     # Force SECLEVEL=1 in imaplib2 to allow connecting to servers with weak DH keys (DH_KEY_TOO_SMALL)
@@ -15,7 +16,7 @@ RUN apk add --no-cache offlineimap openssl && \
 COPY --chown=offlineimap offlineimaprc.*.tmpl /home/offlineimap/
 
 # Add Tini
-#ENV "TINI_VERSION" "v0.16.1"
+ENV "TINI_VERSION" "v0.16.1"
 #ADD "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" "/tini"
 #RUN chmod +x "/tini"
 #ENTRYPOINT ["/tini", "--"]

tests/test.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+set -euo pipefail
+
+IMAGE="$1"
+FAILED=0
+PASSED=0
+
+TMPDIR="$(mktemp -d)"
+trap 'rm -rf "$TMPDIR"' EXIT
+
+assert_eq() {
+  local desc="$1" expected="$2" actual="$3"
+  if [ "$expected" = "$actual" ]; then
+    echo "PASS: $desc"
+    PASSED=$((PASSED + 1))
+  else
+    echo "FAIL: $desc (expected '$expected', got '$actual')"
+    FAILED=$((FAILED + 1))
+  fi
+}
+
+RC=0
+docker run --rm "$IMAGE" offlineimap --version > "$TMPDIR/output" 2>&1 || RC=$?
+assert_eq "Command exits cleanly" "0" "$RC"
+
+if [ -s "$TMPDIR/output" ]; then
+  echo "PASS: Command produces output"
+  PASSED=$((PASSED + 1))
+else
+  echo "FAIL: Command produces no output"
+  FAILED=$((FAILED + 1))
+fi
+
+echo ""
+echo "$PASSED/$((PASSED + FAILED)) tests passed"
+if [ "$FAILED" -gt 0 ]; then
+  exit 1
+fi