Fix docker build/push with lowercase GH repo (#66)

Add labels for Docker container
Give permissions to read from packages (ghcr.io)

Author: tomschr

.github/workflows/ci.yml

@@ -16,13 +16,15 @@ concurrency:
 
 permissions:
   contents: read
+  packages: read
 
 jobs:
   test:
     name: python
     runs-on: ubuntu-latest
     container:
       image: registry.opensuse.org/documentation/containers/15.6/opensuse-daps-toolchain:latest
+      # image: ghcr.io/opensuse/docbuild/daps:latest
 
     steps:
       - name: Checkout repository

.github/workflows/docker-ci-publish.yml

@@ -27,17 +27,23 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Set lowercase repository name
+        id: repo
+        run: echo "repo=$(echo '${{ github.repository }}' | tr '[:upper:]' '[:lower:]')" >> "$GITHUB_OUTPUT"
+
       - name: Build Docker image
+        env:
+          DOCKER_BUILDKIT: 1
         run: |
-          docker build -f ci/Dockerfile -t ghcr.io/${{ github.repository }}/daps:${{ github.sha }} .
+          docker build -f ci/Dockerfile -t ghcr.io/${{ steps.repo.outputs.repo }}/daps:${{ github.sha }} .
 
       - name: Push Docker image
         run: |
-          docker push ghcr.io/${{ github.repository }}/daps:${{ github.sha }}
+          docker push ghcr.io/${{ steps.repo.outputs.repo }}/daps:${{ github.sha }}
 
       # (Optional) Tag as latest if on main
       - name: Tag latest image
         if: github.ref == 'refs/heads/main'
         run: |
-          docker tag ghcr.io/${{ github.repository }}/daps:${{ github.sha }} ghcr.io/${{ github.repository }}/daps:latest
-          docker push ghcr.io/${{ github.repository }}/daps:latest
+          docker tag ghcr.io/${{ steps.repo.outputs.repo }}/daps:${{ github.sha }} ghcr.io/${{ steps.repo.outputs.repo }}/daps:latest
+          docker push ghcr.io/${{ steps.repo.outputs.repo }}/daps:latest

changelog.d/66.infra.rst

@@ -0,0 +1 @@
+Fix docker build/push with lowercase GH repo

ci/Dockerfile

@@ -8,13 +8,14 @@ ARG URL=https://download.opensuse.org/repositories
 
 FROM opensuse/leap:${OPENSUSE_VERSION} AS build
 
+
 # Add the Documentation:Tools OBS repository and refresh
 RUN zypper ar -f ${URL}/Documentation:/Tools/'$releasever' Documentation_Tools ; \
     zypper --gpg-auto-import-keys --non-interactive refresh
 
 # Now install all required packages (from default + custom repo)
 RUN zypper --non-interactive install --no-recommends \
-        curl ca-certificates sgml-skel gzip gpg2 \
+        curl ca-certificates sgml-skel gzip optipng \
         google-noto-sans-jp-regular-fonts google-noto-sans-jp-bold-fonts \
         google-noto-sans-sc-regular-fonts google-noto-sans-sc-bold-fonts \
         google-noto-sans-kr-regular-fonts google-noto-sans-kr-bold-fonts \
@@ -57,13 +58,29 @@ RUN rpm --erase --nodeps adwaita-icon-theme \
       hicolor-icon-theme libreoffice-branding-openSUSE \
       libreoffice-icon-themes || true
 
+
 ###############################################################################
 # 2. Runtime stage: Minimal image with only daps and its dependencies
 ###############################################################################
 FROM opensuse/leap:${OPENSUSE_VERSION}
 
-LABEL maintainer="Tom Schraitle"
+ARG DAPS_VERSION=4.0beta10
+ARG GEEKODOC_VERSION=2.3.1.1
+ARG SUSE_XSL_VERSION=2.95.12
+
+LABEL org.opencontainers.image.vendor="openSUSE"
+LABEL org.opencontainers.image.title="DAPS CI Image"
+LABEL org.opencontainers.image.description="Minimal openSUSE Leap-based image for DAPS and documentation building (used in CI/CD)."
+LABEL org.opencontainers.image.version="1.0.0"
+LABEL org.opencontainers.image.url="https://github.com/openSUSE/docbuild"
 LABEL org.opencontainers.image.source="https://github.com/openSUSE/docbuild"
+LABEL org.opencontainers.image.licenses="GPL-2.0-or-later"
+LABEL org.opencontainers.image.authors="Tom Schraitle <[email protected]>"
+# Custom component labels
+LABEL com.opensuse.docbuild.daps.version="${DAPS_VERSION}"
+LABEL com.opensuse.docbuild.suse-xsl-stylesheets="${SUSE_XSL_VERSION}"
+LABEL com.opensuse.docbuild.geekodoc.version="${GEEKODOC_VERSION}"
+
 
 # Copy daps and suse-xsl-stylesheets from build stage
 COPY --from=build /usr /usr