From e04063c5f10bd781aadaae3026cbe9d678a4f888 Mon Sep 17 00:00:00 2001
From: catttam <caterinaalarconm@gmail.com>
Date: Wed, 10 Jul 2024 12:31:51 +0200
Subject: [PATCH 1/4] Updated build and push action

---
 .github/workflows/docker-image.yml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index f6c911e..54dd6b8 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -7,24 +7,29 @@ on:
     - devel
 
 jobs:
-
-  build:
+  build-and-push-image:
 
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v4
-    - name: GHCR login
+    - name: GHCR login and image tags
       env:
         GHCR_USERNAME: ${{ github.actor }}
         GHCR_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
-      run: echo "${GHCR_TOKEN}" | docker login ghcr.io --username "${GHCR_USERNAME}" --password-stdin
-    - name: Build the Docker image
       run: |
-        GHCR_IMAGE=ghcr.io/grycap/oscar-metrics
+      echo "${GHCR_TOKEN}" | docker login ghcr.io --username "${GHCR_USERNAME}" --password-stdin
+      GHCR_IMAGE=ghcr.io/grycap/oscar-metrics
         if [[ $GITHUB_REF == refs/heads/devel ]]; then
           TAG="${GHCR_IMAGE}:devel"
         else
           TAG="${GHCR_IMAGE}:latest"
         fi
-        docker build . --file Dockerfile --output "type=image,push=true" --tag ${TAG}
+    - name: Build the Docker image
+      id: push
+      uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
+      with:
+        context: .
+        push: true
+        tags: ${TAG}
+#docker build . --file Dockerfile --output "type=image,push=true" --tag ${TAG}

From 7777cc0c348b165f86d54886bbcb4ee7c3c81c8f Mon Sep 17 00:00:00 2001
From: catttam <caterinaalarconm@gmail.com>
Date: Wed, 10 Jul 2024 12:35:22 +0200
Subject: [PATCH 2/4] fixed syntax error

---
 .github/workflows/docker-image.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 54dd6b8..9f0384e 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -18,8 +18,8 @@ jobs:
         GHCR_USERNAME: ${{ github.actor }}
         GHCR_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
       run: |
-      echo "${GHCR_TOKEN}" | docker login ghcr.io --username "${GHCR_USERNAME}" --password-stdin
-      GHCR_IMAGE=ghcr.io/grycap/oscar-metrics
+        echo "${GHCR_TOKEN}" | docker login ghcr.io --username "${GHCR_USERNAME}" --password-stdin
+        GHCR_IMAGE=ghcr.io/grycap/oscar-metrics
         if [[ $GITHUB_REF == refs/heads/devel ]]; then
           TAG="${GHCR_IMAGE}:devel"
         else

From f8a5aefaecf135a9e7246b83a2defd7abc923afc Mon Sep 17 00:00:00 2001
From: catttam <caterinaalarconm@gmail.com>
Date: Wed, 10 Jul 2024 12:37:03 +0200
Subject: [PATCH 3/4] Updated docker-image.yaml

---
 .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 9f0384e..619611e 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -31,5 +31,5 @@ jobs:
       with:
         context: .
         push: true
-        tags: ${TAG}
+        tags: "${TAG}"
 #docker build . --file Dockerfile --output "type=image,push=true" --tag ${TAG}

From 2de8b97fd1be23c7b9ddf365fca50283d3309a15 Mon Sep 17 00:00:00 2001
From: catttam <caterinaalarconm@gmail.com>
Date: Wed, 10 Jul 2024 12:45:43 +0200
Subject: [PATCH 4/4] Updated docker-image.yaml

---
 .github/workflows/docker-image.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 619611e..6e89814 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -17,19 +17,22 @@ jobs:
       env:
         GHCR_USERNAME: ${{ github.actor }}
         GHCR_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
+      run: echo "${GHCR_TOKEN}" | docker login ghcr.io --username "${GHCR_USERNAME}" --password-stdin
+    - name: Set tag
+      id: settag
       run: |
-        echo "${GHCR_TOKEN}" | docker login ghcr.io --username "${GHCR_USERNAME}" --password-stdin
         GHCR_IMAGE=ghcr.io/grycap/oscar-metrics
         if [[ $GITHUB_REF == refs/heads/devel ]]; then
           TAG="${GHCR_IMAGE}:devel"
         else
           TAG="${GHCR_IMAGE}:latest"
         fi
+        echo ::set-output name=tag::${TAG}
     - name: Build the Docker image
       id: push
       uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
       with:
         context: .
         push: true
-        tags: "${TAG}"
+        tags: ${{ steps.settag.outputs.tag }}
 #docker build . --file Dockerfile --output "type=image,push=true" --tag ${TAG}