Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OZ-698: O3 frontend config files served in configs/ instead of ozone/ #116

Merged
merged 2 commits into from
Oct 24, 2024
Merged

OZ-698: O3 frontend config files served in configs/ instead of ozone/ #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04f2ffb
OZ-698: O3 frontend config files served in configs/ instead of ozone/
corneliouzbett Oct 17, 2024
14ba63a
OZ-678: Update bundled-dcoker frontend
corneliouzbett Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions bundled-docker/frontend/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
CMD ["/app/startup.sh"]
6 changes: 2 additions & 4 deletions bundled-docker/frontend/startup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-openmrs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down