Update OCL Client envs for OCL v2 release

openmrs · Apr 13, 2021 · 67088e3 · 67088e3
1 parent e66f40e
commit 67088e3
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 25 deletions.
diff --git a/files/oclclient-demo/docker-compose.yml b/files/oclclient-demo/docker-compose.yml
@@ -1,11 +1,11 @@
-version: '2.1'
+version: "2.1"
 
 services:
   oclclient:
     image: openmrs/ocl-client:demo
     environment:
-      - OCL_API_HOST=${OCL_API_HOST:-https://api.demo.v1.openconceptlab.org}
-      - TRADITIONAL_OCL_HOST=${TRADITIONAL_OCL_HOST:-https://demo.v1.openconceptlab.org}
+      - OCL_API_HOST=${OCL_API_HOST:-https://api.demo.openconceptlab.org}
+      - TRADITIONAL_OCL_HOST=${TRADITIONAL_OCL_HOST:-https://app.demo.openconceptlab.org}
       - ENVIRONMENT=${ENVIRONMENT:-demo}
     ports:
       - 8081:80

diff --git a/files/oclclient-prd/docker-compose.yml b/files/oclclient-prd/docker-compose.yml
@@ -1,11 +1,11 @@
-version: '2.1'
+version: "2.1"
 
 services:
   oclclient:
-    image: openmrs/ocl-client:prd
+    image: openmrs/ocl-client:prd-v1
     environment:
-      - OCL_API_HOST=${OCL_API_HOST:-https://api.openconceptlab.org}
-      - TRADITIONAL_OCL_HOST=${TRADITIONAL_OCL_HOST:-https://openconceptlab.org}
+      - OCL_API_HOST=${OCL_API_HOST:-https://api.v1.openconceptlab.org}
+      - TRADITIONAL_OCL_HOST=${TRADITIONAL_OCL_HOST:-https://v1.openconceptlab.org}
       - ENVIRONMENT=${ENVIRONMENT:-prd}
     ports:
       - 8081:80

diff --git a/files/oclclient-prd2/docker-compose.yml b/files/oclclient-prd2/docker-compose.yml
@@ -1,13 +1,12 @@
-version: '2.1'
+version: "2.1"
 
-# Temporarily (during transition to API 2), we deploy QA (last commit) version of client against production API v2 on AWS
 services:
   oclclient:
-    image: openmrs/ocl-client:qa
+    image: openmrs/ocl-client:prd
     environment:
-      - OCL_API_HOST=${OCL_API_HOST:-https://api.aws.openconceptlab.org}
-      - TRADITIONAL_OCL_HOST=${TRADITIONAL_OCL_HOST:-https://app.aws.openconceptlab.org}
-      - ENVIRONMENT=${ENVIRONMENT:-qa}
+      - OCL_API_HOST=${OCL_API_HOST:-https://api.openconceptlab.org}
+      - TRADITIONAL_OCL_HOST=${TRADITIONAL_OCL_HOST:-https://app.openconceptlab.org}
+      - ENVIRONMENT=${ENVIRONMENT:-prd}
     ports:
       - 8083:80
     restart: always

diff --git a/files/oclclient-qa/docker-compose.yml b/files/oclclient-qa/docker-compose.yml
@@ -1,10 +1,10 @@
-version: '2.1'
+version: "2.1"
 
 services:
   oclclient:
     image: openmrs/ocl-client:qa
     environment:
-      - OCL_API_HOST=${OCL_API_HOST:-https://api.qa.v1.openconceptlab.org}
+      - OCL_API_HOST=${OCL_API_HOST:-https://api.staging.v1.openconceptlab.org}
       - TRADITIONAL_OCL_HOST=${TRADITIONAL_OCL_HOST:-https://qa.v1.openconceptlab.org}
       - ENVIRONMENT=${ENVIRONMENT:-qa}
     ports:

diff --git a/files/oclclient-qa2/docker-compose.yml b/files/oclclient-qa2/docker-compose.yml
@@ -1,15 +1,14 @@
-version: '2.1'
+version: "2.1"
 
 services:
   oclclient:
     image: openmrs/ocl-client:qa
     environment:
-      - OCL_API_HOST=${OCL_API_HOST:-https://api.qa.openconceptlab.org}
-      - TRADITIONAL_OCL_HOST=${TRADITIONAL_OCL_HOST:-https://qa.openconceptlab.org}
+      - OCL_API_HOST=${OCL_API_HOST:-https://api.staging.openconceptlab.org}
+      - TRADITIONAL_OCL_HOST=${TRADITIONAL_OCL_HOST:-https://app.qa.openconceptlab.org}
       - ENVIRONMENT=${ENVIRONMENT:-qa}
     ports:
       - 8084:80
     restart: always
     healthcheck:
       test: ["CMD", "curl", "-sSf", "localhost"]
-
diff --git a/files/oclclient-stg/docker-compose.yml b/files/oclclient-stg/docker-compose.yml
@@ -1,8 +1,8 @@
-version: '2.1'
+version: "2.1"
 
 services:
   oclclient:
-    image: openmrs/ocl-client:stg
+    image: openmrs/ocl-client:stg-v1
     environment:
       - OCL_API_HOST=${OCL_API_HOST:-https://api.staging.v1.openconceptlab.org}
       - TRADITIONAL_OCL_HOST=${TRADITIONAL_OCL_HOST:-https://staging.v1.openconceptlab.org}

diff --git a/files/oclclient-stg2/docker-compose.yml b/files/oclclient-stg2/docker-compose.yml
@@ -1,13 +1,12 @@
-version: '2.1'
+version: "2.1"
 
-# Temporarily (during transition to API 2), we deploy QA (last commit) version of client against staging API v2 on AWS
 services:
   oclclient:
-    image: openmrs/ocl-client:qa
+    image: openmrs/ocl-client:stg
     environment:
       - OCL_API_HOST=${OCL_API_HOST:-https://api.staging.openconceptlab.org}
       - TRADITIONAL_OCL_HOST=${TRADITIONAL_OCL_HOST:-https://app.staging.openconceptlab.org}
-      - ENVIRONMENT=${ENVIRONMENT:-qa}
+      - ENVIRONMENT=${ENVIRONMENT:-stg}
     ports:
       - 8085:80
     restart: always