diff --git a/docker-compose.yml b/docker-compose.yml index 281d846a..2ecfe055 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,8 +27,7 @@ services: dockerfile: Dockerfile.webmon volumes: - web-static:/var/www/workflow/static/ - # add in folder to be picked up by update-ca-certificates in docker entrypoint - - ./nginx/nginx.crt:/usr/local/share/ca-certificates/nginx.crt + - ./nginx/nginx.crt:/nginx.crt env_file: - .env - .env.ci @@ -40,7 +39,7 @@ services: - CATALOG_URL=${CATALOG_URL} - CATALOG_API_TOKEN=${CATALOG_API_TOKEN} - GUNICORN_CMD_ARGS=--reload --workers=8 - - REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt + - REQUESTS_CA_BUNDLE=/nginx.crt healthcheck: test: wget --no-verbose --tries=1 --spider http://localhost:8000/ht || exit 1 interval: 60s diff --git a/src/webmon_app/docker-entrypoint.sh b/src/webmon_app/docker-entrypoint.sh index 43683edd..22454a00 100755 --- a/src/webmon_app/docker-entrypoint.sh +++ b/src/webmon_app/docker-entrypoint.sh @@ -26,8 +26,6 @@ if [[ "$DJANGO_SETTINGS_MODULE" != *".prod" ]]; then >&2 echo "Not in Production, setting up test users InstrumentScientist, and GeneralUser" python $MANAGE_PY_WEBMON ensure_adminuser --username="InstrumentScientist" --email='Instrument@Scientist.com' --password="InstrumentScientist" python $MANAGE_PY_WEBMON ensure_user --username="${GENERAL_USER_USERNAME}" --email='General@User.com' --password="${GENERAL_USER_PASSWORD}" - >&2 echo "Not in Production, updating certificates to add self-signed certificate" - update-ca-certificates fi # start up web-service