diff --git a/nginx.dockerfile b/nginx.dockerfile index fb66d63f..d8bd5b01 100644 --- a/nginx.dockerfile +++ b/nginx.dockerfile @@ -33,6 +33,8 @@ RUN chmod +x /scripts/setup-odk.sh COPY files/nginx/redirector.conf /usr/share/odk/nginx/ COPY files/nginx/common-headers.conf /usr/share/odk/nginx/ +COPY files/nginx/odk.conf.template /usr/share/odk/nginx/ +COPY files/nginx/client-config.json.template /usr/share/odk/nginx/ COPY --from=intermediate client/dist/ /usr/share/nginx/html COPY --from=intermediate /tmp/version.txt /usr/share/nginx/html diff --git a/test/nginx.test.docker-compose.yml b/test/nginx.test.docker-compose.yml index 4a863054..e92eccc8 100644 --- a/test/nginx.test.docker-compose.yml +++ b/test/nginx.test.docker-compose.yml @@ -27,6 +27,8 @@ services: - SENTRY_ORG_SUBDOMAIN=example - SSL_TYPE=selfsign - OIDC_ENABLED=false + - ENKETO_URL=http://enketo:8005 + - SERVICE_URL=http://service:8383 volumes: - ../files/nginx/odk.conf.template:/usr/share/odk/nginx/odk.conf.template:ro - ../files/nginx/client-config.json.template:/usr/share/odk/nginx/client-config.json.template:ro