diff --git a/.env b/.env index 250c9ac..c5458bc 100644 --- a/.env +++ b/.env @@ -25,7 +25,7 @@ OPENMRS_DB_NAME=openmrs # # OpenMRS frontend # -SPA_CONFIG_URLS=/openmrs/spa/ozone/ozone-frontend-config.json +SPA_CONFIG_URLS=/openmrs/spa/configs/ozone-frontend-config.json SPA_DEFAULT_LOCALE=en # OpenMRS frontend and backend Docker image tag diff --git a/bundled-docker/frontend/Dockerfile b/bundled-docker/frontend/Dockerfile index 42aaaa4..113b706 100644 --- a/bundled-docker/frontend/Dockerfile +++ b/bundled-docker/frontend/Dockerfile @@ -1,8 +1,8 @@ FROM openmrs/openmrs-reference-application-3-frontend:nightly ADD distro/binaries/openmrs/frontend /usr/share/nginx/html -ADD distro/configs/openmrs/frontend_config /usr/share/nginx/html/ozone +ADD distro/configs/openmrs/frontend_config /usr/share/nginx/html/configs RUN mkdir -p /app WORKDIR /app COPY bundled-docker/frontend/startup.sh /app RUN chmod +x /app/startup.sh -CMD ["/app/startup.sh"] \ No newline at end of file +CMD ["/app/startup.sh"] diff --git a/bundled-docker/frontend/startup.sh b/bundled-docker/frontend/startup.sh index f557fe2..7f60d42 100755 --- a/bundled-docker/frontend/startup.sh +++ b/bundled-docker/frontend/startup.sh @@ -1,9 +1,7 @@ #!/bin/sh set -e -# if [ -f "/usr/share/nginx/html/ozone/ozone-frontend-config.json" ]; then -# envsubst < "/usr/share/nginx/html/ozone/ozone-frontend-config.json" | sponge "/usr/share/nginx/html/ozone/ozone-frontend-config.json" -# fi -for f in /usr/share/nginx/html/ozone/*.json; do + +for f in /usr/share/nginx/html/configs/*.json; do echo "processing===> $f"; envsubst < $f | sponge $f; done diff --git a/docker-compose-openmrs.yml b/docker-compose-openmrs.yml index 56141d4..c308e09 100644 --- a/docker-compose-openmrs.yml +++ b/docker-compose-openmrs.yml @@ -84,7 +84,7 @@ services: restart: unless-stopped volumes: - "${OPENMRS_FRONTEND_BINARY_PATH}:/usr/share/nginx/html" - - "${OPENMRS_FRONTEND_CONFIG_PATH}:/usr/share/nginx/html/ozone" + - "${OPENMRS_FRONTEND_CONFIG_PATH}:/usr/share/nginx/html/configs" mysql: environment: