From f113ba51d21b2c8d8af4cac2f1183c2fc8c374f8 Mon Sep 17 00:00:00 2001 From: Roman Dvorak Date: Fri, 2 Jan 2026 16:33:23 +0100 Subject: [PATCH 1/2] =?UTF-8?q?Omezen=C3=AD=20workflow=20na=20PR=20koment?= =?UTF-8?q?=C3=A1=C5=99e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/docker_deploy.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker_deploy.yml b/.github/workflows/docker_deploy.yml index dcddace..88a81da 100644 --- a/.github/workflows/docker_deploy.yml +++ b/.github/workflows/docker_deploy.yml @@ -1,11 +1,17 @@ on: push: - # branches: ['release'] + branches: + - master + - release + pull_request: + branches: + - master + - release workflow_dispatch: env: REGISTRY: ghcr.io - IMAGE_NAME: roman-dvorak/DOSPORTAL/web + IMAGE_NAME: universalscientifictechnologies/dosportal/web jobs: build-and-push-image: @@ -16,20 +22,20 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Log in to the Container registry - uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1 + uses: docker/login-action@v3 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Extract metadata (tags, labels) for Docker id: meta - uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 + uses: docker/metadata-action@v5 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - name: Build and push Docker image - uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4 + uses: docker/build-push-action@v6 with: context: . file: Dockerfile From f19c1ebca65e3eacefe95f710a68a4a44941ddef Mon Sep 17 00:00:00 2001 From: Roman Dvorak Date: Fri, 2 Jan 2026 16:40:30 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Podm=C3=ADn=C4=9Bn=C3=BD=20push=20pouze=20z?= =?UTF-8?q?=20master=20v=C4=9Btve?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/docker_deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker_deploy.yml b/.github/workflows/docker_deploy.yml index 88a81da..9660de5 100644 --- a/.github/workflows/docker_deploy.yml +++ b/.github/workflows/docker_deploy.yml @@ -39,6 +39,6 @@ jobs: with: context: . file: Dockerfile - push: true + push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }}