Skip to content

Commit aafbde7

Browse files
committed
优化iconv安装
1 parent 6657243 commit aafbde7

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ RUN export MC="-j$(nproc)" \
1616
&& chmod +x "${MORE_EXTENSION_INSTALLER}" \
1717
&& sh install.sh \
1818
&& sh "${MORE_EXTENSION_INSTALLER}" \
19-
&& rm -rf /tmp/extensions \
20-
&& apk add --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing gnu-libiconv
19+
&& rm -rf /tmp/extensions
2120

2221
ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php
2322

extensions/install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ fi
1818

1919
if [ "${PHP_EXTENSIONS}" != "" ]; then
2020
echo "---------- Install general dependencies ----------"
21-
apk add --no-cache autoconf g++ libtool make curl-dev libxml2-dev linux-headers
21+
apk add --no-cache autoconf g++ libtool make curl-dev libxml2-dev linux-headers --repository http://dl-3.alpinelinux.org/alpine/edge/testing gnu-libiconv
2222
fi
2323

2424
if [ -z "${EXTENSIONS##*,pdo_mysql,*}" ]; then

0 commit comments

Comments
 (0)