From ee49324fa6d991e43140aba9c9a97c14c2381048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20M=C3=BChlbauer?= Date: Wed, 14 Aug 2024 08:39:02 +0200 Subject: [PATCH] FIX: use additional tag on push (#68) * FIX: use additional tag on push --- .github/workflows/build-book-pullrequest.yaml | 4 ++++ .github/workflows/build-book.yaml | 4 ++++ binder/Dockerfile | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-book-pullrequest.yaml b/.github/workflows/build-book-pullrequest.yaml index 3ce6a5d2c..0052690cc 100644 --- a/.github/workflows/build-book-pullrequest.yaml +++ b/.github/workflows/build-book-pullrequest.yaml @@ -27,6 +27,9 @@ on: permissions: contents: read +env: + DOCKER_TAG: pr_68 + jobs: build-book: runs-on: ubuntu-latest @@ -59,6 +62,7 @@ jobs: DOCKER_USERNAME: "openradar" DOCKER_PASSWORD: ${{ secrets.GITHUB_TOKEN }} DOCKER_REGISTRY: "ghcr.io" + ADDITIONAL_TAG: ${{ env.DOCKER_TAG }} PUBLIC_REGISTRY_CHECK: true APPENDIX_FILE: "binder/appendix.txt" REPO2DOCKER_EXTRA_ARGS: --Repo2Docker.base_image=docker.io/library/buildpack-deps:jammy diff --git a/.github/workflows/build-book.yaml b/.github/workflows/build-book.yaml index 608d58d3d..c246e2f42 100644 --- a/.github/workflows/build-book.yaml +++ b/.github/workflows/build-book.yaml @@ -24,6 +24,9 @@ on: default: 'true' type: string # had a lot of trouble with boolean types, see https://github.com/actions/runner/issues/1483 +env: + DOCKER_TAG: pr_68 + jobs: build-container: runs-on: ubuntu-latest @@ -52,6 +55,7 @@ jobs: DOCKER_USERNAME: "openradar" DOCKER_PASSWORD: ${{ secrets.GITHUB_TOKEN }} DOCKER_REGISTRY: "ghcr.io" + ADDITIONAL_TAG: ${{ env.DOCKER_TAG }} PUBLIC_REGISTRY_CHECK: true APPENDIX_FILE: "binder/appendix.txt" REPO2DOCKER_EXTRA_ARGS: --Repo2Docker.base_image=docker.io/library/buildpack-deps:jammy diff --git a/binder/Dockerfile b/binder/Dockerfile index acd07dbc5..713378567 100644 --- a/binder/Dockerfile +++ b/binder/Dockerfile @@ -1 +1 @@ -FROM ghcr.io/openradar/erad2024:d6ee5b14f782 +FROM ghcr.io/openradar/erad2024:pr_68