Merge d1dea0c into 550ff20

openmrs · Mar 19, 2019 · a560365 · a560365
2 parents 550ff20 + d1dea0c
commit a560365
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 45 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -39,16 +39,5 @@ COPY --from=build-deps /usr/src/app/docker/default.conf /etc/nginx/conf.d/
 # Make port 80 available to the world outside the container
 EXPOSE 80
 
-# Copy .env file and shell script to container
-WORKDIR /usr/share/nginx/html
-COPY ./init.sh .
-COPY .env .
-
-# Add bash
-RUN apk add --no-cache bash
-
-# Make our shell script executable
-RUN chmod +x init.sh
-
 # Start Nginx server
-CMD ["/bin/bash", "-c", "/usr/share/nginx/html/init.sh && nginx -g \"daemon off;\""]
+CMD ["nginx", "-g", "daemon off;"]
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -3,6 +3,10 @@ version: '2.1'
 services:
   oclclient:
     image: openmrs/ocl-client:local
+    environment:
+      - REACT_APP_OCL_API_HOST=${REACT_APP_OCL_API_HOST:-https://api.qa.openconceptlab.org/}
+      - REACT_APP_TRADITIONAL_OCL_HOST=${REACT_APP_TRADITIONAL_OCL_HOST:-https://qa.openconceptlab.org}
+      - ENVIRONMENT=${ENVIRONMENT:-local}
     ports:
       - 8081:80
     restart: always

diff --git a/init.sh b/init.sh
diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
     "react-notify-toast": "^0.4.0",
     "react-redux": "^5.0.7",
     "react-render-html": "^0.6.0",
-    "react-router": "^4.4.0",
+    "react-router": "^4.3.1",
     "react-router-dom": "^4.2.2",
     "react-scripts": "1.1.4",
     "react-select": "^2.0.0-beta.7",

diff --git a/public/index.html b/public/index.html
@@ -12,7 +12,6 @@
     <meta name="msapplication-TileColor" content="#da532c">
     <meta name="msapplication-config" content="%PUBLIC_URL%/images/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
-    <script src="./env-config.js"></script>
     <title>OpenMRS OCL client</title>
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.11/css/all.css" integrity="sha384-p2jx59pefphTFIpeqCcISO9MdVfIm4pNnsL08A6v5vaQc4owkQqxMV8kg4Yvhaw/" crossorigin="anonymous">
   </head>

diff --git a/src/config/index.js b/src/config/index.js
@@ -1,4 +1,4 @@
 export default {
-  OCL_API_HOST: (window.env && window.env.OCL_API_HOST) || 'https://api.qa.openconceptlab.org/',
-  TRADITIONAL_OCL: (window.env && window.env.TRADITIONAL_OCL_HOST) || 'https://qa.openconceptlab.org',
+  OCL_API_HOST: (process.env && process.env.REACT_APP_OCL_API_HOST) || 'https://api.qa.openconceptlab.org/',
+  TRADITIONAL_OCL: (process.env && process.env.REACT_APP_TRADITIONAL_OCL_HOST) || 'https://qa.openconceptlab.org',
 };