.woodpecker/build-container.yml

@@ -14,8 +14,7 @@ steps:
       repo: thegeeklab/${CI_REPO_NAME}
 
   - name: security-scan
-    image: docker.io/aquasec/trivy
-    depends_on: security-build
+    image: ghcr.io/aquasecurity/trivy
     commands:
       - trivy -v
       - trivy image --input oci/${CI_REPO_NAME}
@@ -25,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
     image: quay.io/thegeeklab/wp-docker-buildx:5
-    depends_on: security-scan
+    group: container
     settings:
       auto_tag: true
       containerfile: Containerfile.multiarch
@@ -50,7 +48,7 @@ steps:
 
   - name: publish-quay
     image: quay.io/thegeeklab/wp-docker-buildx:5
-    depends_on: security-scan
+    group: container
     settings:
       auto_tag: true
       containerfile: Containerfile.multiarch

.woodpecker/docs.yml

@@ -8,11 +8,13 @@ when:
 steps:
   - name: markdownlint
     image: quay.io/thegeeklab/markdownlint-cli
+    group: test
     commands:
       - markdownlint 'README.md'
 
   - name: 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:
@@ -20,17 +22,18 @@ steps:
 
   - name: link-validation
     image: docker.io/lycheeverse/lychee
+    group: test
     commands:
       - lychee --no-progress --format detailed README.md
 
   - name: 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: OpenLDAP server
       PUSHRM_TARGET: thegeeklab/${CI_REPO_NAME}
@@ -42,10 +45,10 @@ steps:
 
   - name: 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:

Containerfile.multiarch

@@ -1,4 +1,4 @@
-FROM docker.io/alpine:3.20@sha256:beefdbd8a1da6d2915566fde36db9db0b524eb737fc57cd1367effd16dc0d06d
+FROM docker.io/alpine:3.20@sha256:0a4eaa0eecf5f8c050e5bba433f58c052be7587ee8af3e8b3910ef9ab5fbe9f5
 
 LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
 LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
@@ -11,18 +11,20 @@ ARG TARGETOS
 ARG TARGETARCH
 ARG TARGETVARIANT
 
+ARG CONTAINER_LIBRARY
+
 # renovate: datasource=repology depName=alpine_3_20/openldap versioning=loose
-ENV OPENLDAP_VERSION=2.6.8-r0
+ENV OPENLDAP_VERSION=2.6.7-r0
 
 RUN addgroup -g 1001 -S ldap && \
-    adduser -S -D -H -u 1001 -h /openldap -G ldap -g ldap ldap && \
+    adduser -S -D -H -u 1001 -h /var/www -s /usr/lib/openldap -G ldap -g ldap ldap && \
     apk --update add --virtual .build-deps curl && \
-    apk --update --no-cache add openldap \
-        openldap-back-ldap \
-        openldap-back-mdb \
-        openldap-overlay-rwm \
-        openldap-overlay-memberof \
-        openldap-clients && \
+    apk --update --no-cache add openldap=${OPENLDAP_VERSION} \
+        openldap-back-ldap=${OPENLDAP_VERSION} \
+        openldap-back-mdb=${OPENLDAP_VERSION} \
+        openldap-overlay-rwm=${OPENLDAP_VERSION} \
+        openldap-overlay-memberof=${OPENLDAP_VERSION} \
+        openldap-clients=${OPENLDAP_VERSION} && \
     mkdir -p /openldap/conf /openldap/data && \
     cp /etc/openldap/slapd.conf /openldap/conf/slapd.conf && \
     chown -R ldap:ldap /openldap && \