From 423cd925654d61f314fcb914d54d7d7904e4b410 Mon Sep 17 00:00:00 2001 From: phil Date: Tue, 29 Oct 2024 03:38:14 +0100 Subject: [PATCH] CI: build: fix registry login 6 --- .forgejo/workflows/build-with-app-image.yaml | 19 ++++++++++--------- .forgejo/workflows/build.yaml | 4 ---- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.forgejo/workflows/build-with-app-image.yaml b/.forgejo/workflows/build-with-app-image.yaml index d0a46a9..c6ebeaf 100644 --- a/.forgejo/workflows/build-with-app-image.yaml +++ b/.forgejo/workflows/build-with-app-image.yaml @@ -53,7 +53,14 @@ jobs: run: | apt-get install -y --no-install-recommends podman buildah - - name: Build container + - name: Log in to container registry + uses: actions/podman-login@v1 + with: + registry: ${{ vars.REGISTRY }} + username: ${{ secrets.REGISTRY_USER }} + password: ${{ secrets.REGISTRY_PASSWORD }} + + - name: Build container image if: ${{ inputs.build }} uses: actions/buildah-build@v1 with: @@ -62,14 +69,8 @@ jobs: containerfiles: | ./Containerfile.for_runner - - name: Log in to container registry - uses: actions/podman-login@v1 - with: - registry: ${{ vars.REGISTRY }} - username: ${{ secrets.REGISTRY_USER }} - password: ${{ secrets.REGISTRY_PASSWORD }} - - - uses: actions/push-to-registry@v2 + - name: Push container image to registry + uses: actions/push-to-registry@v2 if: ${{ inputs.push }} with: registry: "docker://${{ vars.REGISTRY }}" diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 3dfb3b7..ca14d6e 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -25,10 +25,6 @@ jobs: run: | echo '${{ toJSON(env) }}' - - name: check /etc/containers - run: | - find /etc/containers/ - - uses: actions/checkout@v4 - name: Create venv