Skip to content

Commit 1ba67b1

Browse files
Merge pull request #13 from weierophinney/hotfix/7-ini-concatenation
Ensure newlines are propagated to php.ini settings
2 parents 2dfb4a0 + b46074c commit 1ba67b1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ if [[ "${COMMAND}" == "" ]];then
125125
fi
126126

127127
EXTENSIONS=$(echo "${JOB}" | jq -r ".extensions | map(\"php${PHP}-\"+.) | join(\" \")")
128-
INI=$(echo "${JOB}" | jq -r '.ini | join("\n")')
128+
INI=$(echo "${JOB}" | jq -r '.ini | join("{NL}")')
129129
DEPS=$(echo "${JOB}" | jq -r '.dependencies')
130130

131131
if [[ "${EXTENSIONS}" != "" ]];then
@@ -151,7 +151,7 @@ fi
151151

152152
if [[ "${INI}" != "" ]];then
153153
echo "Installing php.ini settings"
154-
echo $INI > /etc/php/${PHP}/cli/conf.d/99-settings.ini
154+
echo $INI | sed "s/{NL}/\n/g" > /etc/php/${PHP}/cli/conf.d/99-settings.ini
155155
fi
156156

157157
echo "Marking PHP ${PHP} as configured default"

0 commit comments

Comments
 (0)