Merge pull request #13 from weierophinney/hotfix/7-ini-concatenation

Ensure newlines are propagated to php.ini settings
laminas · Apr 1, 2021 · 1ba67b1 · 1ba67b1
2 parents 2dfb4a0 + b46074c
commit 1ba67b1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -125,7 +125,7 @@ if [[ "${COMMAND}" == "" ]];then
 fi
 
 EXTENSIONS=$(echo "${JOB}" | jq -r ".extensions | map(\"php${PHP}-\"+.) | join(\" \")")
-INI=$(echo "${JOB}" | jq -r '.ini | join("\n")')
+INI=$(echo "${JOB}" | jq -r '.ini | join("{NL}")')
 DEPS=$(echo "${JOB}" | jq -r '.dependencies')
 
 if [[ "${EXTENSIONS}" != "" ]];then
@@ -151,7 +151,7 @@ fi
 
 if [[ "${INI}" != "" ]];then
     echo "Installing php.ini settings"
-    echo $INI > /etc/php/${PHP}/cli/conf.d/99-settings.ini
+    echo $INI | sed "s/{NL}/\n/g" > /etc/php/${PHP}/cli/conf.d/99-settings.ini
 fi
 
 echo "Marking PHP ${PHP} as configured default"