Moving things around (again)

Passing in the environment variable to the run command for docker compose, and then adding the variable to the environment again in the docker-compose.yml
e-mission · Sep 19, 2023 · ed51883 · ed51883
1 parent fc5d0f7
commit ed51883
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/nominatim-docker-test.yml b/.github/workflows/nominatim-docker-test.yml
@@ -34,14 +34,14 @@ jobs:
     - name: Workflow test
       run: echo Smoke test
 
-    - name: Variable
-      run: echo "TEST_KEY=$TEST_KEY" > emission/integrationTests/.env
+    # - name: Variable
+    #   run: echo "TEST_KEY=$TEST_KEY" > emission/integrationTests/.env
 
-    - name: Variable2
-      run: cat emission/integrationTests/.env
+    # - name: Variable2
+    #   run: cat emission/integrationTests/.env
 
 
     - name: Test nominatim
-      run: docker-compose -f emission/integrationTests/docker-compose.yml up --exit-code-from web-server
+      run: TEST_KEY=$TEST_KEY docker-compose -f emission/integrationTests/docker-compose.yml up --exit-code-from web-server
 
 
diff --git a/emission/integrationTests/docker-compose.yml b/emission/integrationTests/docker-compose.yml
@@ -45,7 +45,7 @@ services:
       - PBF_URL=https://download.geofabrik.de/north-america/us/rhode-island-latest.osm.pbf
       - REPLICATION_URL=https://download.geofabrik.de/north-america/us/rhode-island-updates/
       - IMPORT_WIKIPEDIA=false
-      - TEST_KEY=$TEST_KEY
+      - TEST_KEY=${TEST_KEY}
     ports:
       - "8080:8080"
       # healthcheck currently commented out, since it isn't necessary and keeps going the entire time the container is running.