From d06d46997a819e9c8e3aab511d000cc7ec3a6e32 Mon Sep 17 00:00:00 2001
From: Andy Bayer Roswell <46857536+AndyBRoswell@users.noreply.github.com>
Date: Tue, 27 Aug 2024 23:14:54 +0200
Subject: [PATCH 1/4] Update ci-pipeline.yml: chkenv

---
 .github/workflows/ci-pipeline.yml | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml
index b19d2eb..b4f4c79 100644
--- a/.github/workflows/ci-pipeline.yml
+++ b/.github/workflows/ci-pipeline.yml
@@ -35,25 +35,23 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: envvar chk
+    - name: chkenv
       run: python -c "import os; print(os.getenv('CELL_GITHUB'))"
 
     - name: Build docker
       run: |
           echo '-> envvar:'
           env
-          cd $DOCKER_FOLDER && docker build . --file Dockerfile -t $TAG --build-arg "NODE_ENV=${{ inputs.environment }}:CELL_GITHUB=${{ env.CELL_GITHUB }}"
+          cd $DOCKER_FOLDER && docker build . --file Dockerfile -t $TAG --build-arg "NODE_ENV=${{ inputs.environment }}"
 
     - name: Run docker compose
       # uses: isbang/compose-action@v1.5.1
       uses: hoverkraft-tech/compose-action@v2.0.1
       with:
         compose-file: "${{ inputs.docker_folder }}/docker-compose.yaml"
-      env:
-        CELL_GITHUB: "https://github.com/QCDIS/NaaVRE-cells-test-3"
 
-    - name: envchk
-      run: cd $DOCKER_FOLDER && docker-compose logs envchk
+    - name: chkenv2
+      run: python -c "import os; print(os.getenv('CELL_GITHUB'))"
 
     - name: Wait for healthy app
       uses: raschmitt/wait-for-healthy-container/@v1
@@ -61,20 +59,14 @@ jobs:
         container-name: app
         timeout: 120
 
-    - name: Print all environment variables
-      run: |
-        echo 'envvar:'
-        env
+    - name: chkenv
+      run: python -c "import os; print(os.getenv('CELL_GITHUB'))"
 
     - name: Capture Docker Logs
       if: failure()
       run: |
-        echo '-> envvar:'
-        env
         echo '-> Capturing Docker logs ...'
         docker logs app
-        echo '-> envvar:'
-        env
 
     - name: Login to github Registry
       if: ${{ inputs.push }}

From 5ee56c16488917b2afbeea2e0bd6d1eee9fe4658 Mon Sep 17 00:00:00 2001
From: Andy Bayer Roswell <46857536+AndyBRoswell@users.noreply.github.com>
Date: Tue, 27 Aug 2024 23:20:44 +0200
Subject: [PATCH 2/4] Update ci-pipeline.yml: chkenv

---
 .github/workflows/ci-pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml
index b4f4c79..fb4b278 100644
--- a/.github/workflows/ci-pipeline.yml
+++ b/.github/workflows/ci-pipeline.yml
@@ -59,7 +59,7 @@ jobs:
         container-name: app
         timeout: 120
 
-    - name: chkenv
+    - name: chkenv3
       run: python -c "import os; print(os.getenv('CELL_GITHUB'))"
 
     - name: Capture Docker Logs

From 5a85210641fa9532dc0beb2c69d082565f93db29 Mon Sep 17 00:00:00 2001
From: Andy Bayer Roswell <46857536+AndyBRoswell@users.noreply.github.com>
Date: Tue, 27 Aug 2024 23:28:23 +0200
Subject: [PATCH 3/4] Update ci-pipeline.yml: chkenv

---
 .github/workflows/ci-pipeline.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml
index fb4b278..965ab3c 100644
--- a/.github/workflows/ci-pipeline.yml
+++ b/.github/workflows/ci-pipeline.yml
@@ -60,6 +60,7 @@ jobs:
         timeout: 120
 
     - name: chkenv3
+      if: always()
       run: python -c "import os; print(os.getenv('CELL_GITHUB'))"
 
     - name: Capture Docker Logs

From 7a6faf3b1737c5429d75aff19ce7e0d17a486fe7 Mon Sep 17 00:00:00 2001
From: Andy Bayer Roswell <46857536+AndyBRoswell@users.noreply.github.com>
Date: Thu, 29 Aug 2024 01:49:57 +0200
Subject: [PATCH 4/4] Update ci-pipeline.yml: chkenv

---
 .github/workflows/ci-pipeline.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml
index 965ab3c..0ef8173 100644
--- a/.github/workflows/ci-pipeline.yml
+++ b/.github/workflows/ci-pipeline.yml
@@ -36,7 +36,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: chkenv
-      run: python -c "import os; print(os.getenv('CELL_GITHUB'))"
+      run: python -c "import os; print(os.getenv('CELL_GITHUB')); print(os.getenv('BASE_PATH'))"
 
     - name: Build docker
       run: |
@@ -51,7 +51,7 @@ jobs:
         compose-file: "${{ inputs.docker_folder }}/docker-compose.yaml"
 
     - name: chkenv2
-      run: python -c "import os; print(os.getenv('CELL_GITHUB'))"
+      run: python -c "import os; print(os.getenv('CELL_GITHUB')); print(os.getenv('BASE_PATH'))"
 
     - name: Wait for healthy app
       uses: raschmitt/wait-for-healthy-container/@v1
@@ -61,7 +61,7 @@ jobs:
 
     - name: chkenv3
       if: always()
-      run: python -c "import os; print(os.getenv('CELL_GITHUB'))"
+      run: python -c "import os; print(os.getenv('CELL_GITHUB')); print(os.getenv('BASE_PATH'))"
 
     - name: Capture Docker Logs
       if: failure()