Pin dependencies

.gitea/workflows/docker-build.yaml

@@ -1,45 +1,46 @@
 name: Docker Build and Push
 
 on:
-  push:
-    branches: [master, main]
   pull_request:
+    branches: [master]
+  push:
+    branches: [master]
   schedule:
-    - cron: '30 3 * * 3'
+    - cron: '0 0 * * *'
 
 jobs:
-  lint:
+  build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
-      - uses: hadolint/hadolint-action@54c9adbab1582c2ef04b2016b760714a4bfde3cf
-        with:
-          dockerfile: Dockerfile
-          failure-threshold: error
+      - name: Checkout
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
 
-  build-and-test:
-    runs-on: ubuntu-latest
-    needs: lint
-    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
-      - name: Build image
-        run: docker build -t ci-image:${{ github.sha }} .
-      - name: Run tests
-        run: bash tests/test.sh ci-image:${{ github.sha }}
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
 
-  push:
-    runs-on: ubuntu-latest
-    needs: build-and-test
-    if: github.event_name != 'pull_request'
-    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
-      - name: Build image
-        run: docker build -t ci-image:${{ github.sha }} .
-      - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee
+      - name: Login to Docker Hub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Tag and push
-        run: |
-          docker tag ci-image:${{ github.sha }} jcabillot/calibre:latest
-          docker push jcabillot/calibre:latest
+
+      - name: Docker metadata
+        id: meta
+        uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6
+        with:
+          images: jcabillot/calibre
+          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@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          pull: true

.gitlab-ci.yml

@@ -1,7 +1,7 @@
-image: docker:latest
+image: "docker:latest@sha256:7d85d0eda291f1a7ab6df4a9d1802b5ad4cf9145a088bd11188c78dcb5c7392b"
 
 services:
-  - "docker:dind"
+  - "docker:dind@sha256:7d85d0eda291f1a7ab6df4a9d1802b5ad4cf9145a088bd11188c78dcb5c7392b"
 
 before_script:
   - "docker login -u \"$CI_REGISTRY_USER\" -p \"$CI_REGISTRY_PASSWORD\" $CI_REGISTRY"

Dockerfile

@@ -1,13 +1,17 @@
-FROM ubuntu:26.04
+FROM "ubuntu:18.04"
 # Il n'est pas possible d'utiliser alpine,
 # cela pose problème avec le script de post-install qui dépends vraiment de glibc.
 # Il faudrait alors partir sur une full recompilation de calibre (sans certitudes sur le bon fonctionnement).
 LABEL maintainer="Julien Cabillot <dockerimages@cabillot.eu>"
 
 RUN export DEBIAN_FRONTEND="noninteractive" && \
+    export BUILD_PACKAGES="wget xz-utils" && \
+    export RUNTIME_PACKAGES="python xvfb libfontconfig libxrender1 libxcomposite1" && \
     apt-get -qq update && \
-    apt-get -qq --yes install python3 xvfb libfontconfig1 libxrender1 libxcomposite1 libegl1 libopengl0 libxcb-cursor0 calibre && \
-    ln -sf /usr/bin/python3 /usr/bin/python && \
+    apt-get -qq --yes install ${BUILD_PACKAGES} ${RUNTIME_PACKAGES} && \
+    wget -nv -O- https://download.calibre-ebook.com/linux-installer.py | python -c "import sys; main=lambda:sys.stderr.write('Download failed\n'); exec(sys.stdin.read()); main()" && \
+    apt-get -qq --yes remove --purge ${BUILD_PACKAGES} && \
+    apt-get -qq --yes autoremove --purge && \
     apt-get -qq --yes clean all && \
     rm -rf "/usr/share/doc/"* \
            "/usr/src/"* \

renovate.json

@@ -1,17 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "gitlabci": {
-    "enabled": true
-  },
-  "customManagers": [
-    {
-      "customType": "regex",
-      "description": "Track Tini version from ENV-based ADD download URL",
-      "managerFilePatterns": ["/^Dockerfile$/"],
-      "matchStrings": ["TINI_VERSION\\s+\"(?<currentValue>[^\"]+)\""],
-      "depNameTemplate": "krallin/tini",
-      "datasourceTemplate": "github-releases",
-      "versioningTemplate": "semver"
-    }
-  ]
-}

tests/test.sh

@@ -1,37 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-IMAGE="$1"
-FAILED=0
-PASSED=0
-
-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
-}
-
-TMPDIR="$(mktemp -d)"
-trap 'rm -rf "$TMPDIR"' EXIT
-
-docker run --rm "$IMAGE" calibre --version > "$TMPDIR/output" 2>&1 && RC=0 || RC=$?
-assert_eq "calibre --version exits cleanly" "0" "$RC"
-
-if [ -s "$TMPDIR/output" ]; then
-  echo "PASS: calibre --version produces output"
-  PASSED=$((PASSED + 1))
-else
-  echo "FAIL: calibre --version produces no output"
-  FAILED=$((FAILED + 1))
-fi
-
-echo ""
-echo "$PASSED/$((PASSED + FAILED)) tests passed"
-if [ "$FAILED" -gt 0 ]; then
-  exit 1
-fi