Updating docker-compose commands and environment variables

eclipse-pass · Apr 5, 2023 · 9090110 · 9090110
1 parent bed973e
commit 9090110
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/.env b/.env
@@ -1,6 +1,7 @@
 ###################################################
 # PASS_CORE config ####################################
 ###################################################
+PASS_VERSION=0.4.0
 PASS_CORE_POSTGRES_PORT=5432
 PASS_CORE_API_PORT=8080
 

diff --git a/.github/workflows/pass-acceptance-tests.yml b/.github/workflows/pass-acceptance-tests.yml
@@ -23,7 +23,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Run pass-docker
-      run: docker compose up -d --quiet-pull --no-build
+      run: docker compose up -d --no-build --quiet-pull --pull always
 
     - name: Checkout pass-acceptance-testing
       uses: actions/checkout@v3

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ The "demo" compose file describes an early system meant to demonstrate some new
 
 Docker compose works as normal, but for the demo you need to specify both correct `yml` file and env file. In order to run a local instance, you can run:
 ``` sh
-docker compose up -d --no-build
+docker compose up -d --no-build --quiet-pull --pull always
 ```
 
 ## Services:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,7 +7,7 @@ version: '3.8'
 #  - eclipse-pass.nightly.yml
 services:
   auth:
-    image: "ghcr.io/eclipse-pass/pass-auth:${TAG}"
+    image: "ghcr.io/eclipse-pass/pass-auth:${PASS_VERSION}"
     container_name: auth
     env_file:
       - .env
@@ -20,7 +20,7 @@ services:
      - source: idp_cert
 
   pass-core:
-    image: "ghcr.io/eclipse-pass/pass-core-main:${TAG}"
+    image: "ghcr.io/eclipse-pass/pass-core-main:${PASS_VERSION}"
     container_name: pass-core
     env_file:
       - .env
@@ -33,7 +33,7 @@ services:
       start_period: 30s
 
   pass-ui:
-    image: "ghcr.io/eclipse-pass/pass-ui:${TAG}"
+    image: "ghcr.io/eclipse-pass/pass-ui:${PASS_VERSION}"
     build:
       context: ./ember
       args:
@@ -69,7 +69,7 @@ services:
 
   proxy:
     build: ./demo-proxy/
-    image: "ghcr.io/eclipse-pass/proxy:${TAG}"
+    image: "ghcr.io/eclipse-pass/proxy:${PASS_VERSION}"
     container_name: proxy
     env_file:
       - .env
@@ -86,7 +86,7 @@ services:
       args:
         STATIC_HTML_GIT_REPO: "${STATIC_HTML_GIT_REPO}"
         STATIC_HTML_GIT_BRANCH: "${STATIC_HTML_GIT_BRANCH}"
-    image: "ghcr.io/eclipse-pass/pass-ui-public:${TAG}"
+    image: "ghcr.io/eclipse-pass/pass-ui-public:${PASS_VERSION}"
     container_name: pass-ui-public
     env_file:
       - .env
@@ -100,7 +100,7 @@ services:
       context: ./idp
       args:
         TENANT: jhu
-    image: "ghcr.io/eclipse-pass/idp:${TAG}"
+    image: "ghcr.io/eclipse-pass/idp:${PASS_VERSION}"
     container_name: idp
     depends_on:
      - ldap
@@ -127,7 +127,7 @@ services:
       context: ./ldap
       args:
         TENANT: jhu
-    image: "ghcr.io/eclipse-pass/demo-ldap:${TAG}"
+    image: "ghcr.io/eclipse-pass/demo-ldap:${PASS_VERSION}"
     container_name: ldap
     env_file:
       - .env