From 31a42b0ce17551ae6388827e0054dd58ec2449c2 Mon Sep 17 00:00:00 2001 From: dresi Date: Tue, 11 Nov 2025 10:49:56 +0100 Subject: [PATCH] .gitea/workflows/docker_build.yaml aktualisiert --- .gitea/workflows/docker_build.yaml | 34 +++++++----------------------- 1 file changed, 8 insertions(+), 26 deletions(-) diff --git a/.gitea/workflows/docker_build.yaml b/.gitea/workflows/docker_build.yaml index dc66571..ee66e2a 100644 --- a/.gitea/workflows/docker_build.yaml +++ b/.gitea/workflows/docker_build.yaml @@ -3,9 +3,6 @@ run-name: ${{ gitea.actor }} is building and pushing container image on: [push] env: - REGISTRY_DOMAIN: harbor.lan - REGISTRY_USER: act_runner - REGISTRY_PASSWORD: "LibgegWaltAtcogwecGaj@Knyajes4" RESULT_IMAGE_NAME: tools/rsyncd jobs: @@ -18,45 +15,30 @@ jobs: - name: Log in to registry uses: docker/login-action@v3 with: - registry: ${{ env.REGISTRY_DOMAIN }} - username: act_runner - #password: ${{ env.REGISTRY_PASSWORD }} - password: LibgegWaltAtcogwecGaj@Knyajes4 + registry: ${{ env.PRIVATE_REGISTRY_DOMAIN }} + username: ${{ env.PRIVATE_REGISTRY_USER }} + password: ${{ secret.PRIVATE_REGISTRY_PASSWORD }} + #password: LibgegWaltAtcogwecGaj@Knyajes4 - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Prepare BuildKit config with custom CA - # Definiere den Hostnamen (ggf. mit Port) - env: - REGISTRY_HOST: "harbor.lan" - REGISTRY_CA_CERT: ${{ secrets.REGISTRY_CA_CERT }} run: | - # 1. Erstelle ein temporäres Verzeichnis für unsere Dateien CONFIG_DIR_PATH="${{ runner.temp }}/buildx-config" mkdir -p "${CONFIG_DIR_PATH}" - # 2. Definiere die Pfade für die beiden Dateien CERT_FILE_PATH="${CONFIG_DIR_PATH}/ca.crt" CONFIG_FILE_PATH="${CONFIG_DIR_PATH}/buildkitd.toml" - # 3. Schreibe das Zertifikat in die Zertifikatsdatei - echo "${REGISTRY_CA_CERT}" > "${CERT_FILE_PATH}" - echo "Zertifikat geschrieben nach ${CERT_FILE_PATH}" + echo "${{ env.PRIVATE_REGISTRY_CA_CERT }}" > "${CERT_FILE_PATH}" - # 4. Erstelle die TOML-Konfigurationsdatei - # Diese muss den *absoluten Pfad* zur Zertifikatsdatei enthalten. cat << EOF > "${CONFIG_FILE_PATH}" - [registry."${REGISTRY_HOST}"] + [registry."${{ env.PRIVATE_REGISTRY_DOMAIN }}"] ca = ["${CERT_FILE_PATH}"] EOF - - echo "BuildKit-Konfiguration geschrieben nach ${CONFIG_FILE_PATH}" - - # 5. Mache den Pfad zur TOML-Datei für den nächsten Schritt verfügbar + echo "BUILDKIT_CONFIG=${CONFIG_FILE_PATH}" >> $GITEA_ENV # Für Gitea - # Für GitHub Actions wäre es: - # echo "BUILDKIT_CONFIG=${CONFIG_FILE_PATH}" >> $GITHUB_ENV - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -68,4 +50,4 @@ jobs: with: platforms: linux/amd64,linux/arm64 push: true - tags: ${{ env.REGISTRY_DOMAIN }}/${{ env.RESULT_IMAGE_NAME }}:latest \ No newline at end of file + tags: ${{ env.PRIVATE_REGISTRY_DOMAIN }}/${{ env.RESULT_IMAGE_NAME }}:latest \ No newline at end of file