Merge pull request 'Migrate Renovate config' (#7) from renovate/migrate-config into master

Reviewed-on: #7

.gitea/workflows/docker-build.yaml

@@ -1,46 +1,45 @@
 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-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: Login to Docker Hub
+  push:
+    runs-on: ubuntu-latest
+    needs: build-and-test
     if: github.event_name != 'pull_request'
-        uses: docker/login-action@v4
+    steps:
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
+      - name: Build image
+        run: docker build -t ci-image:${{ github.sha }} .
+      - 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/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@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/calibre:latest
+          docker push jcabillot/calibre:latest

.gitlab-ci.yml

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

Dockerfile

@@ -1,17 +1,13 @@
-FROM "ubuntu:18.04"
+FROM ubuntu:26.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 ${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 install python3 xvfb libfontconfig1 libxrender1 libxcomposite1 libegl1 libopengl0 libxcb-cursor0 calibre && \
+    ln -sf /usr/bin/python3 /usr/bin/python && \
     apt-get -qq --yes clean all && \
     rm -rf "/usr/share/doc/"* \
            "/usr/src/"* \

renovate.json

@@ -0,0 +1,17 @@
+{
+  "$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

@@ -0,0 +1,37 @@
+#!/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