Merge pull request 'ci: add automatic semver tagging on merge to master' (#11) from feat/semver-tag-action into master

Reviewed-on: #11

.gitea/workflows/docker-build.yaml

@@ -11,51 +11,33 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
-      - uses: hadolint/hadolint-action@54c9adbab1582c2ef04b2016b760714a4bfde3cf
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+      - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
         with:
           dockerfile: Dockerfile
           failure-threshold: error
 
-  build:
+  build-and-test:
     runs-on: ubuntu-latest
     needs: lint
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
       - 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
-
-  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
+    needs: build-and-test
     if: github.event_name != 'pull_request'
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
-      - uses: ChristopherHX/gitea-download-artifact@75635f32b4c1c41c4b3d64e8f85210112ed4c9c7
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
         with:
-          name: docker-image
-      - name: Load image
-        run: docker load < image.tar
-      - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee
+          fetch-depth: 0
+      - name: Build image
+        run: docker build -t ci-image:${{ github.sha }} .
+      - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -63,3 +45,12 @@ jobs:
         run: |
           docker tag ci-image:${{ github.sha }} jcabillot/calibre:latest
           docker push jcabillot/calibre:latest
+      - name: Bump version and push tag
+        if: github.event_name == 'push'
+        uses: anothrNick/github-tag-action@4ed44965e0db8dab2b466a16da04aec3cc312fd8 # v1.75.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          DEFAULT_BUMP: patch
+          RELEASE_BRANCHES: master
+          WITH_V: true
+          GIT_API_TAGGING: false

.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"
+    }
+  ]
+}