From baaa6830b9547fd069da881f088de9a54d3cbe80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Dutheillet-Lamonth=C3=A9zie?=
 <thomas.dutheillet@ng-analytics.com>
Date: Wed, 31 Jul 2024 10:51:39 +0200
Subject: [PATCH] #32: clean workflow files and add env variable in
 pushbasedockerimage.yml

---
 .github/workflows/build-and-test.yml      | 4 ++--
 .github/workflows/pushbasedockerimage.yml | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 6c4a97c4b5..ce947112c5 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -23,7 +23,7 @@ jobs:
       VT_TV_TESTS_ENABLED: 'ON' # Build & Test in all configurations
       VT_TV_COVERAGE_ENABLED: ${{ matrix.image == 'ubuntu_22.04-gcc_12-vtk_9.3.0-py_3.8' && 'ON' || 'OFF' }}  # Coverage only with main test image
       VT_TV_PYTHON_BINDINGS_ENABLED: 'ON'
-      DOCKER_REPOSITORY: pierrpebay/vt-tv # lifflander1/vt 
+      DOCKER_REPOSITORY: lifflander1/vt
     name: vt-tv build and test
     steps:
       - uses: actions/checkout@v4
@@ -55,7 +55,7 @@ jobs:
           context: .
           file: ./ci/docker/build-and-test.dockerfile
           build-args: |
-            BASE_IMAGE=${{ env.DOCKER_REPOSITORY }}:${{ matrix.image }} 
+            BASE_IMAGE=${{ env.DOCKER_REPOSITORY }}:${{ matrix.image }}
             VT_TV_TESTS_ENABLED=${{ env.VT_TV_TESTS_ENABLED }}
             VT_TV_COVERAGE_ENABLED=${{ env.VT_TV_COVERAGE_ENABLED }}
           outputs: type=local,dest=${{ env.OUTPUT_DIR }}
diff --git a/.github/workflows/pushbasedockerimage.yml b/.github/workflows/pushbasedockerimage.yml
index bb759753fb..1f682d3ee8 100644
--- a/.github/workflows/pushbasedockerimage.yml
+++ b/.github/workflows/pushbasedockerimage.yml
@@ -22,6 +22,8 @@ jobs:
   push_to_registry:
     name: Build & Push
     runs-on: ubuntu-latest
+    env:
+      DOCKER_REPOSITORY: lifflander1/vt
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
@@ -74,4 +76,4 @@ jobs:
             PYTHON_VERSION=${{ env.PYTHON_VERSION }}
           file: ci/docker/make-base.dockerfile
           push: true
-          tags: lifflander1/vt:${{ env.DOCKER_TAG }}
+          tags: "${{ env.DOCKER_REPOSITORY }}:${{ env.DOCKER_TAG }}"