From f867497ebe26d8440bf37894f4e30a201850c63e Mon Sep 17 00:00:00 2001 From: Caterina <36919673+catttam@users.noreply.github.com> Date: Wed, 10 Jul 2024 09:48:54 +0200 Subject: [PATCH 1/4] Update docker-image.yml --- .github/workflows/docker-image.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 8efa9ba..90cd1ec 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -2,7 +2,9 @@ name: Docker Image CI on: push: - branches: [ "main" ] + branches: + - main + - devel jobs: @@ -20,5 +22,9 @@ jobs: - name: Build the Docker image run: | GHCR_IMAGE=ghcr.io/grycap/oscar-metrics - - docker build . --file Dockerfile --output "type=image,push=true" --tag ${GHCR_IMAGE}:latest + if [[ $GITHUB_REF == refs/heads/devel ]]; then + TAGS="--tag ${GHCR_IMAGE}:devel" + else + TAGS="${GHCR_IMAGE}:latest" + fi + docker build . --file Dockerfile --output "type=image,push=true" ${TAGS} From a59bd089a403b49ea026acab29fb4fec081f4936 Mon Sep 17 00:00:00 2001 From: Caterina <36919673+catttam@users.noreply.github.com> Date: Wed, 10 Jul 2024 09:50:29 +0200 Subject: [PATCH 2/4] Update docker-image.yml --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 90cd1ec..5f89bc3 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -27,4 +27,4 @@ jobs: else TAGS="${GHCR_IMAGE}:latest" fi - docker build . --file Dockerfile --output "type=image,push=true" ${TAGS} + docker build . --file Dockerfile --output "type=image,push=true" "${TAGS}" From f86361dcf014193caafb304c148ca9d8d29619c3 Mon Sep 17 00:00:00 2001 From: Caterina <36919673+catttam@users.noreply.github.com> Date: Wed, 10 Jul 2024 09:52:51 +0200 Subject: [PATCH 3/4] Update docker-image.yml --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 5f89bc3..8038ffe 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -25,6 +25,6 @@ jobs: if [[ $GITHUB_REF == refs/heads/devel ]]; then TAGS="--tag ${GHCR_IMAGE}:devel" else - TAGS="${GHCR_IMAGE}:latest" + TAGS="--tag ${GHCR_IMAGE}:latest" fi docker build . --file Dockerfile --output "type=image,push=true" "${TAGS}" From 074cbcb5a52d72dec9d0c364a5ef34f25b498037 Mon Sep 17 00:00:00 2001 From: Caterina <36919673+catttam@users.noreply.github.com> Date: Wed, 10 Jul 2024 09:56:50 +0200 Subject: [PATCH 4/4] Update docker-image.yml --- .github/workflows/docker-image.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 8038ffe..f6c911e 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -23,8 +23,8 @@ jobs: run: | GHCR_IMAGE=ghcr.io/grycap/oscar-metrics if [[ $GITHUB_REF == refs/heads/devel ]]; then - TAGS="--tag ${GHCR_IMAGE}:devel" + TAG="${GHCR_IMAGE}:devel" else - TAGS="--tag ${GHCR_IMAGE}:latest" + TAG="${GHCR_IMAGE}:latest" fi - docker build . --file Dockerfile --output "type=image,push=true" "${TAGS}" + docker build . --file Dockerfile --output "type=image,push=true" --tag ${TAG}