During startup, now performing standard env var substitution when rea…

…ding the configuration files

docker/orthanc/Dockerfile

@@ -423,6 +423,8 @@ RUN if [[ ! -z "$TARGETPLATFORM" ]] && [[ "$TARGETPLATFORM" != "linux/amd64" ]];
 RUN chmod +x /usr/share/orthanc/plugins-available/*
 RUN chmod +x /usr/local/bin/*
 
+RUN pip install envsubst==0.1.5
+
 # configure SSL for azure rest sdk (azure object storage plugin)
 ENV SSL_CERT_DIR=/etc/ssl/certs
 

docker/orthanc/generateConfiguration.py

@@ -5,6 +5,7 @@
 import typing
 import tempfile
 import subprocess
+from envsubst import envsubst
 
 from helpers import JsonPath, logInfo, logWarning, logError, removeCppCommentsFromJson, isEnvVarDefinedEmptyOrTrue, enableVerboseModeForConfigGeneration
 from configurator import OrthancConfigurator
@@ -35,6 +36,9 @@
   logInfo("reading configuration from " + filePath)
   with open(filePath, "r") as f:
     content = f.read()
+
+    # perform standard env var substitution before trying to read the json file (https://github.com/orthanc-server/orthanc-builder/issues/9)
+    content = envsubst(content)
     try:
       cleanedContent = removeCppCommentsFromJson(content)
       configFromFile = json.loads(cleanedContent)

release-notes-docker-images.txt

@@ -9,6 +9,8 @@ You should use the full image only if you need to use one of these:
 Only the default tags are listed here.  You just need to append `-full` for the full image.
 
 
+          - During startup, now performing standard env var substitution when reading the 
+            configuration files.
 23.6.0 :  - POSSIBLE BREAKING CHANGE:
             Created an 'orthanc' user (uid = 999) and 'orthanc' group (gid = 999) inside the image
             to allow executing the image as a non root user.  The image is still executing as root