declare -x "$line"

Dockerfile

@@ -16,7 +16,7 @@
 	APACHE_LOG_DIR=/var/log/apache2
 
 # System setup
 RUN set x; \
 	apt-get clean \
 	&& apt-get update \
 	&& apt-get --no-install-recommends install -y aptitude \
@@ -1015,7 +1015,7 @@
 COPY --from=composer $MW_ORIGIN_FILES $MW_ORIGIN_FILES
 
 # Default values
 ENV MW_AUTOUPDATE=true \
 	MW_MAINTENANCE_UPDATE=0 \
 	MW_ENABLE_EMAIL=0 \
 	MW_ENABLE_USER_EMAIL=0 \
@@ -1100,10 +1100,8 @@
 	&& mkdir -p $MW_ORIGIN_FILES/extensions/Widgets \
 	&& mv $MW_HOME/extensions/Widgets/compiled_templates $MW_ORIGIN_FILES/extensions/Widgets/ \
 	&& ln -s $MW_VOLUME/extensions/Widgets/compiled_templates $MW_HOME/extensions/Widgets/compiled_templates \
-	# Modify /etc/bash.bashrc
-	&& echo 'if [ -f /etc/environment ]; then' >> /etc/bash.bashrc \
-	&& echo '    export $(grep -v "^#" /etc/environment | xargs)' >> /etc/bash.bashrc \
-	&& echo 'fi' >> /etc/bash.bashrc
+	# Modify /etc/bash.bashrc (loaded for `docker-compose exec web bash` command)
+	&& echo '. /etc/profile.d/load-env-vars.sh' >> /etc/bash.bashrc
 
 COPY _sources/images/Powered-by-Canasta.png /var/www/mediawiki/w/resources/assets/
 

_sources/scripts/profile.d/load-env-vars.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# loaded for the `docker-compose exec web bash -cl '...'` command
 
 if [ -f /etc/environment_secrets ]; then
     # Get the system start time and environment secrets modification time
@@ -8,6 +9,12 @@ if [ -f /etc/environment_secrets ]; then
     # Compare timestamps
     if [ "$ENV_SECRETS_MOD_TIME" -ge "$CONTAINER_START_TIME" ]; then
         # The file was created after the system started, we can use it
-        export "$(grep -v "^#" /etc/environment_secrets | xargs)"
+        # Read and export each line (ignoring comments) individually
+        while IFS= read -r line; do
+            # Skip empty lines and lines starting with '#'
+            if [[ -n "$line" && "$line" != \#* ]]; then
+                declare -x "$line"
+            fi
+        done < /etc/environment_secrets
     fi
 fi