mirror of
https://github.com/danog/php.git
synced 2024-11-27 12:24:58 +01:00
d1c1222433
Full diff from before this change, to show the impact of this commit slightly more clearly: ```diff diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index c3c3d36..60491a0 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -1,7 +1,7 @@ FROM alpine:3.3 -# phpize deps -RUN apk add --no-cache --virtual .phpize-deps \ +# persistent / runtime deps +ENV PHPIZE_DEPS \ autoconf \ file \ g++ \ @@ -10,8 +10,6 @@ RUN apk add --no-cache --virtual .phpize-deps \ make \ pkgconf \ re2c - -# persistent / runtime deps RUN apk add --no-cache --virtual .persistent-deps \ ca-certificates \ curl @@ -39,6 +37,7 @@ ENV PHP_SHA256 %%PHP_SHA256%% RUN set -xe \ && apk add --no-cache --virtual .build-deps \ + $PHPIZE_DEPS \ curl-dev \ gnupg \ libedit-dev \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index a95b582..397eee5 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -1,7 +1,7 @@ FROM debian:jessie -# phpize deps -RUN apt-get update && apt-get install -y \ +# persistent / runtime deps +ENV PHPIZE_DEPS \ autoconf \ file \ g++ \ @@ -9,11 +9,9 @@ RUN apt-get update && apt-get install -y \ libc-dev \ make \ pkg-config \ - re2c \ - --no-install-recommends && rm -r /var/lib/apt/lists/* - -# persistent / runtime deps + re2c RUN apt-get update && apt-get install -y \ + $PHPIZE_DEPS \ ca-certificates \ curl \ libedit2 \ diff --git a/docker-php-ext-install b/docker-php-ext-install index 67180a8..eb2380a 100755 --- a/docker-php-ext-install +++ b/docker-php-ext-install @@ -55,6 +55,10 @@ if [ -z "$exts" ]; then exit 1 fi +if [ -e /lib/apk/db/installed ] && [ -n "$PHPIZE_DEPS" ]; then + apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS +fi + for ext in $exts; do ( cd "$ext" @@ -69,3 +73,7 @@ for ext in $exts; do make -j"$j" clean ) done + +if [ -e /lib/apk/db/installed ] && [ -n "$PHPIZE_DEPS" ]; then + apk del .phpize-deps +fi ```
82 lines
2.4 KiB
Plaintext
82 lines
2.4 KiB
Plaintext
FROM debian:jessie
|
|
|
|
# persistent / runtime deps
|
|
ENV PHPIZE_DEPS \
|
|
autoconf \
|
|
file \
|
|
g++ \
|
|
gcc \
|
|
libc-dev \
|
|
make \
|
|
pkg-config \
|
|
re2c
|
|
RUN apt-get update && apt-get install -y \
|
|
$PHPIZE_DEPS \
|
|
ca-certificates \
|
|
curl \
|
|
libedit2 \
|
|
libsqlite3-0 \
|
|
libxml2 \
|
|
--no-install-recommends && rm -r /var/lib/apt/lists/*
|
|
|
|
ENV PHP_INI_DIR /usr/local/etc/php
|
|
RUN mkdir -p $PHP_INI_DIR/conf.d
|
|
|
|
##<autogenerated>##
|
|
##</autogenerated>##
|
|
|
|
ENV GPG_KEYS %%GPG_KEYS%%
|
|
|
|
ENV PHP_VERSION %%PHP_VERSION%%
|
|
ENV PHP_FILENAME %%PHP_FILENAME%%
|
|
ENV PHP_SHA256 %%PHP_SHA256%%
|
|
|
|
RUN set -xe \
|
|
&& buildDeps=" \
|
|
$PHP_EXTRA_BUILD_DEPS \
|
|
libcurl4-openssl-dev \
|
|
libedit-dev \
|
|
libsqlite3-dev \
|
|
libssl-dev \
|
|
libxml2-dev \
|
|
xz-utils \
|
|
" \
|
|
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
|
|
&& curl -fSL "http://php.net/get/$PHP_FILENAME/from/this/mirror" -o "$PHP_FILENAME" \
|
|
&& echo "$PHP_SHA256 *$PHP_FILENAME" | sha256sum -c - \
|
|
&& curl -fSL "http://php.net/get/$PHP_FILENAME.asc/from/this/mirror" -o "$PHP_FILENAME.asc" \
|
|
&& export GNUPGHOME="$(mktemp -d)" \
|
|
&& for key in $GPG_KEYS; do \
|
|
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
|
|
done \
|
|
&& gpg --batch --verify "$PHP_FILENAME.asc" "$PHP_FILENAME" \
|
|
&& rm -r "$GNUPGHOME" "$PHP_FILENAME.asc" \
|
|
&& mkdir -p /usr/src/php \
|
|
&& tar -xf "$PHP_FILENAME" -C /usr/src/php --strip-components=1 \
|
|
&& rm "$PHP_FILENAME" \
|
|
&& cd /usr/src/php \
|
|
&& ./configure \
|
|
--with-config-file-path="$PHP_INI_DIR" \
|
|
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
|
|
$PHP_EXTRA_CONFIGURE_ARGS \
|
|
--disable-cgi \
|
|
# --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself)
|
|
--enable-mysqlnd \
|
|
# --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
|
|
--enable-mbstring \
|
|
--with-curl \
|
|
--with-libedit \
|
|
--with-openssl \
|
|
--with-zlib \
|
|
&& make -j"$(nproc)" \
|
|
&& make install \
|
|
&& { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \
|
|
&& make clean \
|
|
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false $buildDeps
|
|
|
|
COPY docker-php-ext-* /usr/local/bin/
|
|
|
|
##<autogenerated>##
|
|
CMD ["php", "-a"]
|
|
##</autogenerated>##
|