diff --git a/docker/build/internal_files/clearml.conf.template b/docker/build/internal_files/clearml.conf.template index e91f2aa..b06cc3f 100644 --- a/docker/build/internal_files/clearml.conf.template +++ b/docker/build/internal_files/clearml.conf.template @@ -55,6 +55,12 @@ server { rewrite /files/(.*) /$1 break; } + location /widgets { + alias /usr/share/nginx/widgets; + try_files $uri $uri/ /widgets/index.html; + add_header Content-Security-Policy "frame-ancestors *"; + } + error_page 404 /404.html; location = /40x.html { } diff --git a/docker/build/internal_files/entrypoint.sh b/docker/build/internal_files/entrypoint.sh index df9a888..7b78a8d 100644 --- a/docker/build/internal_files/entrypoint.sh +++ b/docker/build/internal_files/entrypoint.sh @@ -47,19 +47,19 @@ EOF fi # Create an empty configuration json - echo "{}" > configuration.json + echo "{}" > /tmp/configuration.json # Copy the external configuration file if it exists if test -f "/mnt/external_files/configs/configuration.json"; then echo "Copying external configuration" - cp /mnt/external_files/configs/configuration.json configuration.json + cp /mnt/external_files/configs/configuration.json /tmp/configuration.json fi # Update from env variables echo "Updating configuration from env" /opt/clearml/utilities/update_from_env.py \ --verbose \ - configuration.json \ + /tmp/configuration.json \ /usr/share/nginx/html/configuration.json export NGINX_APISERVER_ADDR=${NGINX_APISERVER_ADDRESS:-http://apiserver:8008} diff --git a/docker/build/internal_files/final_image_preparation.sh b/docker/build/internal_files/final_image_preparation.sh index ed761be..ea16652 100644 --- a/docker/build/internal_files/final_image_preparation.sh +++ b/docker/build/internal_files/final_image_preparation.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +set -x set -o errexit set -o nounset set -o pipefail