docker yleiseksi rakenteeltaan

.gitea/workflows/build_publish-artifact.yml

@@ -16,6 +16,10 @@ on:
         required: true
       GIT_PAGES_PUBLISH_TOKEN:
         required: true
+      DOCKER_USERNAME:
+        required: false
+      DOCKER_PASSWORD:
+        required: true
 
 env:
   GITEA_API_URL: ${{ fromJson(inputs.env_json).GITEA_API_URL }}
@@ -23,6 +27,9 @@ env:
   GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
   GIT_PAGES_PUBLISH_TOKEN: ${{ secrets.GIT_PAGES_PUBLISH_TOKEN }}
   REPO: ${{ github.repository }}
+  DOCKER_REGISTRY: ${{ fromJson(inputs.env_json).DOCKER_REGISTRY || '' }}
+  DOCKER_IMAGE_TAG: ${{ fromJson(inputs.env_json).DOCKER_IMAGE_TAG || '' }}
+  DOCKER_UI_URL: ${{ fromJson(inputs.env_json).DOCKER_UI_URL || '' }}
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -146,7 +153,7 @@ jobs:
             --label "git.commit=${{ github.sha }}" \
             --label "git.commitBy=${{ github.actor }}" \
             --label "build.date=${NOW}" \
-            -t "gitea-ci-library-test-minimal:${NEXT_VERSION}" .
+            -t "${DOCKER_IMAGE_TAG}:${NEXT_VERSION}" .
 
       - name: Report status SUCCESS
         if: steps.gatekeeper.outputs.skip == 'false' && success()
@@ -165,7 +172,7 @@ jobs:
         run: |
           source /tmp/build-ctx/build.env
           mkdir -p /tmp/image
-          docker save "gitea-ci-library-test-minimal:${NEXT_VERSION}" -o /tmp/image/artifact.tar
+          docker save "${DOCKER_IMAGE_TAG}:${NEXT_VERSION}" -o /tmp/image/artifact.tar
 
       - name: Upload Docker image artifact
         if: steps.gatekeeper.outputs.skip == 'false' && success()
@@ -215,25 +222,36 @@ jobs:
           echo "===== gitea-ci-library - Docker Push | begin ====="
           bash scripts/report-status.sh pending "Pushing to registry..." ci-docker-push
 
-      - name: Push to Gitea Packages
+      - name: Push to Docker Registry
         if: steps.gatekeeper.outputs.skip == 'false'
         env:
-          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME || github.actor }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
         run: |
           source /tmp/build-ctx/build.env
           docker load -i /tmp/image/artifact.tar
-          REGISTRY=$(echo "${{ gitea.server_url }}" | sed -e 's|^https://||' -e 's|^http://||')
-          IMAGE="$REGISTRY/${{ gitea.repository }}:${NEXT_VERSION}"
-          docker tag "gitea-ci-library-test-minimal:${NEXT_VERSION}" "$IMAGE"
-          echo "$GITEA_TOKEN" | docker login "$REGISTRY" -u "${{ github.actor }}" --password-stdin
-          docker push "$IMAGE"
-          docker logout "$REGISTRY"
+
+          REGISTRY="${DOCKER_REGISTRY:?DOCKER_REGISTRY not set in env.conf}"
+          IMAGE="${DOCKER_IMAGE_TAG:?DOCKER_IMAGE_TAG not set in env.conf}"
+          REGISTRY_HOST="${REGISTRY%%/*}"
+
+          FULL_IMAGE="${REGISTRY}/${IMAGE}:${NEXT_VERSION}"
+          echo "Pushing ${FULL_IMAGE} ..."
+
+          docker tag "${DOCKER_IMAGE_TAG}:${NEXT_VERSION}" "$FULL_IMAGE"
+          echo "$DOCKER_PASSWORD" | docker login "$REGISTRY_HOST" -u "$DOCKER_USERNAME" --password-stdin
+          docker push "$FULL_IMAGE"
+          docker logout "$REGISTRY_HOST"
 
       - name: Report status SUCCESS
         if: steps.gatekeeper.outputs.skip == 'false' && success()
         run: |
           source /tmp/build-ctx/build.env
-          bash scripts/report-status.sh success "Docker push $NEXT_VERSION OK" ci-docker-push
+          CONTAINER_URL=""
+          if [ -n "${DOCKER_UI_URL:-}" ] && [ -n "${NEXT_VERSION:-}" ]; then
+            CONTAINER_URL="${DOCKER_UI_URL}/${NEXT_VERSION}"
+          fi
+          bash scripts/report-status.sh success "Docker push $NEXT_VERSION OK" ci-docker-push "" "$CONTAINER_URL"
 
       - name: Report status FAILURE
         if: steps.gatekeeper.outputs.skip == 'false' && failure()

.gitea/workflows/gitea-env.conf

@@ -1,2 +1,5 @@
 GITEA_API_URL=https://gitea.app.keskikuja.site
 GIT_PAGES_URL=https://ci-reports.helm-dev.keskikuja.site
+DOCKER_REGISTRY=gitea.app.keskikuja.site/niko
+DOCKER_IMAGE_TAG=gitea-ci-library-test-image
+DOCKER_UI_URL=https://gitea.app.keskikuja.site/niko/gitea-ci-library/packages