feat: pass through additional Dockerfile env vars

Author: Greelan

python/3.10/Dockerfile

@@ -17,6 +17,7 @@ FROM        cubecoders/ampbase:debian
 LABEL       org.opencontainers.image.licenses=MIT
 
 ENV         PIP_DISABLE_PIP_VERSION_CHECK="1"
+ENV         AMP_ADDITIONAL_ENV_VARS="PIP_DISABLE_PIP_VERSION_CHECK"
 ENV         DEBIAN_FRONTEND="noninteractive"
 
 ARG         PYTHON_VERSION="3.10"

python/3.11/Dockerfile

@@ -17,6 +17,7 @@ FROM        cubecoders/ampbase:debian
 LABEL       org.opencontainers.image.licenses=MIT
 
 ENV         PIP_DISABLE_PIP_VERSION_CHECK="1"
+ENV         AMP_ADDITIONAL_ENV_VARS="PIP_DISABLE_PIP_VERSION_CHECK"
 ENV         DEBIAN_FRONTEND="noninteractive"
 
 ARG         PYTHON_VERSION="3.11"

python/3.12/Dockerfile

@@ -17,6 +17,7 @@ FROM        cubecoders/ampbase:debian
 LABEL       org.opencontainers.image.licenses=MIT
 
 ENV         PIP_DISABLE_PIP_VERSION_CHECK="1"
+ENV         AMP_ADDITIONAL_ENV_VARS="PIP_DISABLE_PIP_VERSION_CHECK"
 ENV         DEBIAN_FRONTEND="noninteractive"
 
 ARG         PYTHON_VERSION="3.12"

python/3.13/Dockerfile

@@ -17,6 +17,7 @@ FROM        cubecoders/ampbase:debian
 LABEL       org.opencontainers.image.licenses=MIT
 
 ENV         PIP_DISABLE_PIP_VERSION_CHECK="1"
+ENV         AMP_ADDITIONAL_ENV_VARS="PIP_DISABLE_PIP_VERSION_CHECK"
 ENV         DEBIAN_FRONTEND="noninteractive"
 
 ARG         PYTHON_VERSION="3.13"

python/3/Dockerfile

@@ -53,6 +53,7 @@ FROM        cubecoders/ampbase:debian
 LABEL       org.opencontainers.image.licenses=MIT
 
 ENV         PIP_DISABLE_PIP_VERSION_CHECK="1"
+ENV         AMP_ADDITIONAL_ENV_VARS="PIP_DISABLE_PIP_VERSION_CHECK"
 ENV         DEBIAN_FRONTEND="noninteractive"
 
 ARG         PYTHON_DEFAULT="3.11"

scripts/base/ampstart.sh

@@ -96,9 +96,16 @@ keep_env=(
   PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games
   MAIL=/var/mail/amp
 )
+# Always keep these AMP_ env vars if set
 for v in AMPHOSTPLATFORM AMP_CONTAINER AMP_CONTAINER_HOST_NETWORK AMPMEMORYLIMIT AMPSWAPLIMIT AMPCONTAINERCPUS; do
   if [[ -n "${!v-}" ]]; then keep_env+=("$v=${!v}"); fi
 done
+# Extra passthrough of env vars listed in AMP_ADDITIONAL_ENV_VARS in the Dockerfile
+if [[ -n "${AMP_ADDITIONAL_ENV_VARS-}" ]]; then
+  for v in ${AMP_ADDITIONAL_ENV_VARS}; do
+    if [[ -n "${!v-}" ]]; then keep_env+=("$v=${!v}"); fi
+  done
+fi
 
 exec gosu amp:amp env -i "${keep_env[@]}" \
   bash -c "cd /AMP && exec ${AMP_BIN} ${ARGS}"