Skip to content

Commit 7fd5a10

Browse files
committed
split the token
1 parent 1ed0f58 commit 7fd5a10

3 files changed

Lines changed: 32 additions & 23 deletions

File tree

Containerfile

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -80,50 +80,55 @@ RUN echo "" && \
8080
postgresql-client \
8181
" \
8282
&& \
83+
export PHP_8_5_RUN_DEPS_ALPINE=" \
84+
gnu-libiconv \
85+
mariadb-connector-c \
86+
" && \
87+
\
8388
export PHP_8_4_RUN_DEPS_ALPINE=" \
8489
gnu-libiconv \
8590
mariadb-connector-c \
86-
" && \
91+
" && \
8792
\
8893
export PHP_8_3_RUN_DEPS_ALPINE=" \
8994
gnu-libiconv \
9095
mariadb-connector-c \
91-
" && \
96+
" && \
9297
\
9398
export PHP_8_2_RUN_DEPS_ALPINE=" \
9499
gnu-libiconv \
95100
mariadb-connector-c \
96-
" && \
101+
" && \
97102
\
98103
export PHP_8_1_RUN_DEPS_ALPINE=" \
99104
gnu-libiconv \
100105
mariadb-connector-c \
101-
" && \
106+
" && \
102107
\
103108
export PHP_8_0_RUN_DEPS_ALPINE=" \
104109
gnu-libiconv \
105110
mariadb-connector-c \
106-
" && \
111+
" && \
107112
\
108113
export PHP_7_4_RUN_DEPS_ALPINE=" \
109114
mariadb-connector-c \
110-
" && \
115+
" && \
111116
\
112117
export PHP_7_3_RUN_DEPS_ALPINE=" \
113118
mariadb-connector-c \
114-
" && \
119+
" && \
115120
\
116121
export PHP_7_2_RUN_DEPS_ALPINE=" \
117-
" && \
122+
" && \
118123
\
119124
export PHP_7_1_RUN_DEPS_ALPINE=" \
120-
" && \
125+
" && \
121126
\
122127
export PHP_7_0_RUN_DEPS_ALPINE=" \
123-
" && \
128+
" && \
124129
\
125130
export PHP_5_6_RUN_DEPS_ALPINE=" \
126-
" && \
131+
" && \
127132
\
128133
export PHP_RUN_DEPS_DEBIAN=" \
129134
ca-certificates \
@@ -132,26 +137,29 @@ RUN echo "" && \
132137
php-pear \
133138
postgresql-client \
134139
" \
140+
export PHP_8_5_RUN_DEPS_DEBIAN=" \
141+
" && \
142+
\
135143
export PHP_8_4_RUN_DEPS_DEBIAN=" \
136144
" && \
137145
\
138146
export PHP_8_3_RUN_DEPS_DEBIAN=" \
139-
" && \
147+
" && \
140148
\
141149
export PHP_8_2_RUN_DEPS_DEBIAN=" \
142-
" && \
150+
" && \
143151
\
144152
export PHP_8_1_RUN_DEPS=_DEBIAN" \
145-
" && \
153+
" && \
146154
\
147155
export PHP_8_0_RUN_DEPS_DEBIAN=" \
148-
" && \
156+
" && \
149157
\
150158
export PHP_7_4_RUN_DEPS_DEBIAN=" \
151-
" && \
159+
" && \
152160
\
153161
export PHP_7_3_RUN_DEPS_DEBIAN=" \
154-
" && \
162+
" && \
155163
\
156164
source /container/base/functions/container/build && \
157165
container_build_log image && \
@@ -193,7 +201,6 @@ RUN echo "" && \
193201
case "$(container_info distro)" in \
194202
"alpine" ) \
195203
package install $(apk search -q php${_php_version} | grep "^php${_php_version}" | sed -e "/-cgi/d" -e "/-apache2/d" -e "/-doc/d" -e "/-dbg/d") ; \
196-
#if [ -f "${_php_folder}"/conf.d/*magick*.ini ]; then mv "${_php_folder}"/conf.d/*magick*.ini /tmp; fi; \
197204
sed -i "s|;cgi.fix_pathinfo=1|cgi.fix_pathinfo=0|g" ${_php_folder}/php.ini ; \
198205
;; \
199206
"debian" ) \
@@ -267,6 +274,5 @@ RUN echo "" && \
267274
rm -rf \
268275
/root/.composer
269276

270-
EXPOSE 9000
271277

272278
COPY rootfs /

rootfs/container/functions/20-php-fpm

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -709,10 +709,13 @@ phpfpm_nginx_site_configure_php() {
709709
local php_index_file=""
710710
local _site_index_var="NGINX_SITE_${_sitename^^}_INDEXFILE"
711711
if [ -n "${!_site_index_var:-}" ]; then
712-
php_index_file="${!_site_index_var}"
712+
_site_index_val="${!_site_index_var}"
713+
IFS=$', ' read -ra _idx_arr <<< "${_site_index_val}"
714+
php_index_file="${_idx_arr[0]}"
713715
else
714716
if [ "${allow_defaults,,}" = "true" ] && [ -n "${NGINX_INDEX_FILE}" ]; then
715-
php_index_file="${NGINX_INDEX_FILE}"
717+
IFS=$', ' read -ra _idx_arr <<< "${NGINX_INDEX_FILE}"
718+
php_index_file="${_idx_arr[0]}"
716719
else
717720
php_index_file="index.php"
718721
fi

rootfs/usr/local/bin/php-ext

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ enable_module () {
176176
echo "** Activating Optional Modules"
177177
for module in "${modules_available}"/*.ini; do
178178
if ! grep -w -i -q "$(basename ${module} .ini)" "${php_env_modules_enabled}"; then
179-
echo "Enabling $(basename ${module} .ini)"
179+
echo "[php-ext] Enabling $(basename ${module} .ini)"
180180
case "${os}" in
181181
"alpine" )
182182
ln -sf "${module}" ${php_prefix}conf.d/$(cat ${module} | grep ";priority" | cut -d = -f 2)-$(basename ${module})
@@ -200,7 +200,7 @@ enable_module () {
200200
done
201201

202202
if [[ "$MATCH" -lt 1 ]] ; then
203-
echo "Enabling $(basename ${module} .ini)"
203+
echo "[php-ext] Enabling $(basename ${module} .ini)"
204204
case "${os}" in
205205
"alpine" )
206206
ln -sf "${module}" ${php_prefix}conf.d/$(cat ${module} | grep ";priority" | cut -d = -f 2)-$(basename ${module})

0 commit comments

Comments
 (0)