From 312a957294bcb3aaf8fc4bdf9726daf806438aca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brage=20Skj=C3=B8nborg?= Date: Sun, 4 Jan 2026 16:38:58 +0100 Subject: [PATCH] Runner 11 --- .github/workflows/build-java-app.yml | 6 ++++++ .github/workflows/build-python-app.yml | 6 ++++++ .github/workflows/build-v5.yml | 12 ++++-------- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-java-app.yml b/.github/workflows/build-java-app.yml index a57fb87e..506100d1 100644 --- a/.github/workflows/build-java-app.yml +++ b/.github/workflows/build-java-app.yml @@ -72,6 +72,12 @@ jobs: run: | docker run --rm local-${{ inputs.app }}:${{ inputs.dockerTag }} /bin/sh -c "echo 'Smoke test OK'" + - name: Docker login + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_HUB_NAME }} + password: ${{ secrets.DOCKER_HUB_TOKEN }} + - name: Push Docker image uses: docker/build-push-action@v5 diff --git a/.github/workflows/build-python-app.yml b/.github/workflows/build-python-app.yml index c5bf5399..adfbf89b 100644 --- a/.github/workflows/build-python-app.yml +++ b/.github/workflows/build-python-app.yml @@ -61,6 +61,12 @@ jobs: run: | docker run --rm local-${{ inputs.app }}:${{ inputs.dockerTag }} /bin/sh -c "echo 'Smoke test OK'" + - name: Docker login + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_HUB_NAME }} + password: ${{ secrets.DOCKER_HUB_TOKEN }} + # Push final image - name: Push Docker image uses: docker/build-push-action@v5 diff --git a/.github/workflows/build-v5.yml b/.github/workflows/build-v5.yml index e8da7340..04a34e41 100644 --- a/.github/workflows/build-v5.yml +++ b/.github/workflows/build-v5.yml @@ -16,8 +16,8 @@ jobs: converter: ${{ steps.filter.outputs.converter }} coordinator: ${{ steps.filter.outputs.coordinator }} ui: ${{ steps.filter.outputs.ui }} - py-metadata: ${{ steps.filter.outputs.metadata }} - py-watcher: ${{ steps.filter.outputs.watcher }} + py-metadata: ${{ steps.filter.outputs.metadata }} + py-watcher: ${{ steps.filter.outputs.watcher }} dockerTag: ${{ steps.tag.outputs.tag }} steps: @@ -47,11 +47,6 @@ jobs: id: tag run: echo "tag=$(date -u +'%Y.%m.%d')-$(uuidgen | cut -c 1-8)" >> $GITHUB_OUTPUT - - name: Docker login - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_HUB_NAME }} - password: ${{ secrets.DOCKER_HUB_TOKEN }} build-shared: needs: pre-check @@ -73,7 +68,7 @@ jobs: - app: coordinator enabled: true - app: ui - enabled: false # sett til false for å deaktivere UI + enabled: false uses: ./.github/workflows/build-java-app.yml with: @@ -103,3 +98,4 @@ jobs: shouldBuild: ${{ needs.pre-check.outputs[matrix.app] == 'true' || needs.pre-check.outputs.shared == 'true' || github.event_name == 'workflow_dispatch' }} + secrets: inherit \ No newline at end of file