.woodpecker/build-container.yml

@@ -6,18 +6,15 @@ when:
       - ${CI_REPO_DEFAULT_BRANCH}
 
 steps:
-  - name: security-build
+  security-build:
-    image: quay.io/thegeeklab/wp-docker-buildx:6
+    image: quay.io/thegeeklab/wp-docker-buildx:2
     settings:
       containerfile: Containerfile.multiarch
       output: type=oci,dest=oci/${CI_REPO_NAME},tar=false
       repo: thegeeklab/${CI_REPO_NAME}
-      registry_config:
-        from_secret: DOCKER_REGISTRY_CONFIG_PULL
 
-  - name: security-scan
+  security-scan:
-    image: docker.io/aquasec/trivy
+    image: ghcr.io/aquasecurity/trivy
-    depends_on: security-build
     commands:
       - trivy -v
       - trivy image --input oci/${CI_REPO_NAME}
@@ -27,11 +24,10 @@ steps:
       TRIVY_NO_PROGRESS: "true"
       TRIVY_SEVERITY: HIGH,CRITICAL
       TRIVY_TIMEOUT: 1m
-      TRIVY_DB_REPOSITORY: docker.io/aquasec/trivy-db:2
 
-  - name: publish-dockerhub
+  publish-dockerhub:
-    image: quay.io/thegeeklab/wp-docker-buildx:6
+    group: container
-    depends_on: security-scan
+    image: quay.io/thegeeklab/wp-docker-buildx:2
     settings:
       auto_tag: true
       containerfile: Containerfile.multiarch
@@ -50,9 +46,9 @@ steps:
         branch:
           - ${CI_REPO_DEFAULT_BRANCH}
 
-  - name: publish-quay
+  publish-quay:
-    image: quay.io/thegeeklab/wp-docker-buildx:6
+    group: container
-    depends_on: security-scan
+    image: quay.io/thegeeklab/wp-docker-buildx:2
     settings:
       auto_tag: true
       containerfile: Containerfile.multiarch

.woodpecker/build-package.yml

@@ -6,14 +6,14 @@ when:
       - ${CI_REPO_DEFAULT_BRANCH}
 
 steps:
-  - name: changelog
+  changelog:
     image: quay.io/thegeeklab/git-sv
     commands:
       - git sv current-version
       - git sv release-notes -t ${CI_COMMIT_TAG:-next} -o CHANGELOG.md
       - cat CHANGELOG.md
 
-  - name: publish-gitea
+  publish-gitea:
     image: quay.io/thegeeklab/wp-gitea-release
     settings:
       api_key:

.woodpecker/docs.yml

@@ -6,31 +6,34 @@ when:
       - ${CI_REPO_DEFAULT_BRANCH}
 
 steps:
-  - name: markdownlint
+  markdownlint:
     image: quay.io/thegeeklab/markdownlint-cli
+    group: test
     commands:
       - markdownlint 'README.md'
 
-  - name: spellcheck
+  spellcheck:
     image: quay.io/thegeeklab/alpine-tools
+    group: test
     commands:
       - spellchecker --files '_docs/**/*.md' 'README.md' -d .dictionary -p spell indefinite-article syntax-urls
     environment:
       FORCE_COLOR: "true"
 
-  - name: link-validation
+  link-validation:
     image: docker.io/lycheeverse/lychee
+    group: test
     commands:
       - lychee --no-progress --format detailed README.md
 
-  - name: pushrm-dockerhub
+  pushrm-dockerhub:
     image: docker.io/chko/docker-pushrm:1
-    depends_on: [markdownlint, spellcheck, link-validation]
+    secrets:
+      - source: docker_password
+        target: DOCKER_PASS
+      - source: docker_username
+        target: DOCKER_USER
     environment:
-      DOCKER_PASS:
-        from_secret: docker_password
-      DOCKER_USER:
-        from_secret: docker_username
       PUSHRM_FILE: README.md
       PUSHRM_SHORT: Custom image for Hugo
       PUSHRM_TARGET: thegeeklab/${CI_REPO_NAME}
@@ -40,12 +43,12 @@ steps:
           - ${CI_REPO_DEFAULT_BRANCH}
         status: [success]
 
-  - name: pushrm-quay
+  pushrm-quay:
     image: docker.io/chko/docker-pushrm:1
-    depends_on: [markdownlint, spellcheck, link-validation]
+    secrets:
+      - source: quay_token
+        target: APIKEY__QUAY_IO
     environment:
-      APIKEY__QUAY_IO:
-        from_secret: quay_token
       PUSHRM_FILE: README.md
       PUSHRM_TARGET: quay.io/thegeeklab/${CI_REPO_NAME}
     when:

.woodpecker/notify.yml

@@ -8,17 +8,17 @@ when:
 runs_on: [success, failure]
 
 steps:
-  - name: matrix
+  matrix:
     image: quay.io/thegeeklab/wp-matrix
     settings:
       homeserver:
         from_secret: matrix_homeserver
-      room_id:
+      password:
-        from_secret: matrix_room_id
+        from_secret: matrix_password
-      user_id:
+      roomid:
-        from_secret: matrix_user_id
+        from_secret: matrix_roomid
-      access_token:
+      username:
-        from_secret: matrix_access_token
+        from_secret: matrix_username
     when:
       - status: [success, failure]
 

Containerfile.multiarch

@@ -1,4 +1,4 @@
-FROM docker.io/alpine:3.20@sha256:1e42bbe2508154c9126d48c2b8a75420c3544343bf86fd041fb7527e017a4b4a
+FROM docker.io/thegeeklab/alpine:latest@sha256:a0578a5a454f4492c892c985affda27d02e8096dbcc6d6bc19efbf319eb4c3f6
 
 LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
 LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
@@ -14,7 +14,7 @@ ARG TARGETVARIANT
 ARG HUGO_VERSION
 
 # renovate: datasource=github-releases depName=gohugoio/hugo
-ENV HUGO_VERSION="${HUGO_VERSION:-v0.136.5}"
+ENV HUGO_VERSION="${HUGO_VERSION:-v0.121.2}"
 
 ENV HUGO_ENV=production