Skip to content

Commit 4d09bc4

Browse files
committed
Keep the source and instead just "make clean"
1 parent 97c1d90 commit 4d09bc4

File tree

6 files changed

+66
-60
lines changed

6 files changed

+66
-60
lines changed

5.4/Dockerfile

+11-10
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ FROM debian:jessie
33
# persistent / runtime deps
44
RUN apt-get update && apt-get install -y ca-certificates curl libxml2 --no-install-recommends && rm -r /var/lib/apt/lists/*
55

6+
# phpize deps
7+
RUN apt-get update && apt-get install -y autoconf pkg-config --no-install-recommends && rm -r /var/lib/apt/lists/*
8+
9+
ENV PHP_INI_DIR /usr/local/etc/php
10+
RUN mkdir -p $PHP_INI_DIR/conf.d
11+
612
##<autogenerated>##
713
##</autogenerated>##
814

@@ -16,12 +22,9 @@ RUN buildDeps=" \
1622
bzip2 \
1723
file \
1824
libcurl4-openssl-dev \
19-
libpng12-dev \
2025
libreadline6-dev \
2126
libssl-dev \
2227
libxml2-dev \
23-
m4 \
24-
pkg-config \
2528
"; \
2629
set -x \
2730
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
@@ -32,22 +35,20 @@ RUN buildDeps=" \
3235
&& tar -xf php.tar.bz2 -C /usr/src/php --strip-components=1 \
3336
&& rm php.tar.bz2* \
3437
&& cd /usr/src/php \
35-
&& ./configure --disable-cgi \
38+
&& ./configure \
39+
--with-config-file-path="$PHP_INI_DIR" \
40+
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
3641
$PHP_EXTRA_CONFIGURE_ARGS \
37-
--enable-soap \
42+
--disable-cgi \
3843
--with-curl \
39-
--with-gd \
40-
--with-mysql \
41-
--with-mysqli \
4244
--with-openssl \
43-
--with-pdo-mysql \
4445
--with-readline \
4546
--with-zlib \
4647
&& make -j"$(nproc)" \
4748
&& make install \
4849
&& { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \
4950
&& apt-get purge -y --auto-remove $buildDeps \
50-
&& rm -r /usr/src/php
51+
&& make clean
5152

5253
##<autogenerated>##
5354
CMD ["php", "-a"]

5.4/apache/Dockerfile

+11-10
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ FROM debian:jessie
33
# persistent / runtime deps
44
RUN apt-get update && apt-get install -y ca-certificates curl libxml2 --no-install-recommends && rm -r /var/lib/apt/lists/*
55

6+
# phpize deps
7+
RUN apt-get update && apt-get install -y autoconf pkg-config --no-install-recommends && rm -r /var/lib/apt/lists/*
8+
9+
ENV PHP_INI_DIR /usr/local/etc/php
10+
RUN mkdir -p $PHP_INI_DIR/conf.d
11+
612
##<autogenerated>##
713
RUN apt-get update && apt-get install -y apache2-bin apache2.2-common --no-install-recommends && rm -rf /var/lib/apt/lists/*
814

@@ -29,12 +35,9 @@ RUN buildDeps=" \
2935
bzip2 \
3036
file \
3137
libcurl4-openssl-dev \
32-
libpng12-dev \
3338
libreadline6-dev \
3439
libssl-dev \
3540
libxml2-dev \
36-
m4 \
37-
pkg-config \
3841
"; \
3942
set -x \
4043
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
@@ -45,22 +48,20 @@ RUN buildDeps=" \
4548
&& tar -xf php.tar.bz2 -C /usr/src/php --strip-components=1 \
4649
&& rm php.tar.bz2* \
4750
&& cd /usr/src/php \
48-
&& ./configure --disable-cgi \
51+
&& ./configure \
52+
--with-config-file-path="$PHP_INI_DIR" \
53+
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
4954
$PHP_EXTRA_CONFIGURE_ARGS \
50-
--enable-soap \
55+
--disable-cgi \
5156
--with-curl \
52-
--with-gd \
53-
--with-mysql \
54-
--with-mysqli \
5557
--with-openssl \
56-
--with-pdo-mysql \
5758
--with-readline \
5859
--with-zlib \
5960
&& make -j"$(nproc)" \
6061
&& make install \
6162
&& { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \
6263
&& apt-get purge -y --auto-remove $buildDeps \
63-
&& rm -r /usr/src/php
64+
&& make clean
6465

6566
##<autogenerated>##
6667
WORKDIR /var/www/html

5.5/Dockerfile

+11-10
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ FROM debian:jessie
33
# persistent / runtime deps
44
RUN apt-get update && apt-get install -y ca-certificates curl libxml2 --no-install-recommends && rm -r /var/lib/apt/lists/*
55

6+
# phpize deps
7+
RUN apt-get update && apt-get install -y autoconf pkg-config --no-install-recommends && rm -r /var/lib/apt/lists/*
8+
9+
ENV PHP_INI_DIR /usr/local/etc/php
10+
RUN mkdir -p $PHP_INI_DIR/conf.d
11+
612
##<autogenerated>##
713
##</autogenerated>##
814

@@ -16,12 +22,9 @@ RUN buildDeps=" \
1622
bzip2 \
1723
file \
1824
libcurl4-openssl-dev \
19-
libpng12-dev \
2025
libreadline6-dev \
2126
libssl-dev \
2227
libxml2-dev \
23-
m4 \
24-
pkg-config \
2528
"; \
2629
set -x \
2730
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
@@ -32,22 +35,20 @@ RUN buildDeps=" \
3235
&& tar -xf php.tar.bz2 -C /usr/src/php --strip-components=1 \
3336
&& rm php.tar.bz2* \
3437
&& cd /usr/src/php \
35-
&& ./configure --disable-cgi \
38+
&& ./configure \
39+
--with-config-file-path="$PHP_INI_DIR" \
40+
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
3641
$PHP_EXTRA_CONFIGURE_ARGS \
37-
--enable-soap \
42+
--disable-cgi \
3843
--with-curl \
39-
--with-gd \
40-
--with-mysql \
41-
--with-mysqli \
4244
--with-openssl \
43-
--with-pdo-mysql \
4445
--with-readline \
4546
--with-zlib \
4647
&& make -j"$(nproc)" \
4748
&& make install \
4849
&& { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \
4950
&& apt-get purge -y --auto-remove $buildDeps \
50-
&& rm -r /usr/src/php
51+
&& make clean
5152

5253
##<autogenerated>##
5354
CMD ["php", "-a"]

5.5/apache/Dockerfile

+11-10
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ FROM debian:jessie
33
# persistent / runtime deps
44
RUN apt-get update && apt-get install -y ca-certificates curl libxml2 --no-install-recommends && rm -r /var/lib/apt/lists/*
55

6+
# phpize deps
7+
RUN apt-get update && apt-get install -y autoconf pkg-config --no-install-recommends && rm -r /var/lib/apt/lists/*
8+
9+
ENV PHP_INI_DIR /usr/local/etc/php
10+
RUN mkdir -p $PHP_INI_DIR/conf.d
11+
612
##<autogenerated>##
713
RUN apt-get update && apt-get install -y apache2-bin apache2.2-common --no-install-recommends && rm -rf /var/lib/apt/lists/*
814

@@ -29,12 +35,9 @@ RUN buildDeps=" \
2935
bzip2 \
3036
file \
3137
libcurl4-openssl-dev \
32-
libpng12-dev \
3338
libreadline6-dev \
3439
libssl-dev \
3540
libxml2-dev \
36-
m4 \
37-
pkg-config \
3841
"; \
3942
set -x \
4043
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
@@ -45,22 +48,20 @@ RUN buildDeps=" \
4548
&& tar -xf php.tar.bz2 -C /usr/src/php --strip-components=1 \
4649
&& rm php.tar.bz2* \
4750
&& cd /usr/src/php \
48-
&& ./configure --disable-cgi \
51+
&& ./configure \
52+
--with-config-file-path="$PHP_INI_DIR" \
53+
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
4954
$PHP_EXTRA_CONFIGURE_ARGS \
50-
--enable-soap \
55+
--disable-cgi \
5156
--with-curl \
52-
--with-gd \
53-
--with-mysql \
54-
--with-mysqli \
5557
--with-openssl \
56-
--with-pdo-mysql \
5758
--with-readline \
5859
--with-zlib \
5960
&& make -j"$(nproc)" \
6061
&& make install \
6162
&& { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \
6263
&& apt-get purge -y --auto-remove $buildDeps \
63-
&& rm -r /usr/src/php
64+
&& make clean
6465

6566
##<autogenerated>##
6667
WORKDIR /var/www/html

5.6/Dockerfile

+11-10
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ FROM debian:jessie
33
# persistent / runtime deps
44
RUN apt-get update && apt-get install -y ca-certificates curl libxml2 --no-install-recommends && rm -r /var/lib/apt/lists/*
55

6+
# phpize deps
7+
RUN apt-get update && apt-get install -y autoconf pkg-config --no-install-recommends && rm -r /var/lib/apt/lists/*
8+
9+
ENV PHP_INI_DIR /usr/local/etc/php
10+
RUN mkdir -p $PHP_INI_DIR/conf.d
11+
612
##<autogenerated>##
713
##</autogenerated>##
814

@@ -16,12 +22,9 @@ RUN buildDeps=" \
1622
bzip2 \
1723
file \
1824
libcurl4-openssl-dev \
19-
libpng12-dev \
2025
libreadline6-dev \
2126
libssl-dev \
2227
libxml2-dev \
23-
m4 \
24-
pkg-config \
2528
"; \
2629
set -x \
2730
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
@@ -32,22 +35,20 @@ RUN buildDeps=" \
3235
&& tar -xf php.tar.bz2 -C /usr/src/php --strip-components=1 \
3336
&& rm php.tar.bz2* \
3437
&& cd /usr/src/php \
35-
&& ./configure --disable-cgi \
38+
&& ./configure \
39+
--with-config-file-path="$PHP_INI_DIR" \
40+
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
3641
$PHP_EXTRA_CONFIGURE_ARGS \
37-
--enable-soap \
42+
--disable-cgi \
3843
--with-curl \
39-
--with-gd \
40-
--with-mysql \
41-
--with-mysqli \
4244
--with-openssl \
43-
--with-pdo-mysql \
4445
--with-readline \
4546
--with-zlib \
4647
&& make -j"$(nproc)" \
4748
&& make install \
4849
&& { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \
4950
&& apt-get purge -y --auto-remove $buildDeps \
50-
&& rm -r /usr/src/php
51+
&& make clean
5152

5253
##<autogenerated>##
5354
CMD ["php", "-a"]

5.6/apache/Dockerfile

+11-10
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ FROM debian:jessie
33
# persistent / runtime deps
44
RUN apt-get update && apt-get install -y ca-certificates curl libxml2 --no-install-recommends && rm -r /var/lib/apt/lists/*
55

6+
# phpize deps
7+
RUN apt-get update && apt-get install -y autoconf pkg-config --no-install-recommends && rm -r /var/lib/apt/lists/*
8+
9+
ENV PHP_INI_DIR /usr/local/etc/php
10+
RUN mkdir -p $PHP_INI_DIR/conf.d
11+
612
##<autogenerated>##
713
RUN apt-get update && apt-get install -y apache2-bin apache2.2-common --no-install-recommends && rm -rf /var/lib/apt/lists/*
814

@@ -29,12 +35,9 @@ RUN buildDeps=" \
2935
bzip2 \
3036
file \
3137
libcurl4-openssl-dev \
32-
libpng12-dev \
3338
libreadline6-dev \
3439
libssl-dev \
3540
libxml2-dev \
36-
m4 \
37-
pkg-config \
3841
"; \
3942
set -x \
4043
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
@@ -45,22 +48,20 @@ RUN buildDeps=" \
4548
&& tar -xf php.tar.bz2 -C /usr/src/php --strip-components=1 \
4649
&& rm php.tar.bz2* \
4750
&& cd /usr/src/php \
48-
&& ./configure --disable-cgi \
51+
&& ./configure \
52+
--with-config-file-path="$PHP_INI_DIR" \
53+
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
4954
$PHP_EXTRA_CONFIGURE_ARGS \
50-
--enable-soap \
55+
--disable-cgi \
5156
--with-curl \
52-
--with-gd \
53-
--with-mysql \
54-
--with-mysqli \
5557
--with-openssl \
56-
--with-pdo-mysql \
5758
--with-readline \
5859
--with-zlib \
5960
&& make -j"$(nproc)" \
6061
&& make install \
6162
&& { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \
6263
&& apt-get purge -y --auto-remove $buildDeps \
63-
&& rm -r /usr/src/php
64+
&& make clean
6465

6566
##<autogenerated>##
6667
WORKDIR /var/www/html

0 commit comments

Comments
 (0)