Skip to content

Commit 9a2b39f

Browse files
principlesoftware-devprinciplesoftware-dev
committed
Merge pull request #845 from J0WI/alpine10
Add Alpine 3.10
2 parents ce9154f + 636d6ad commit 9a2b39f

File tree

74 files changed

+6605
-1
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+6605
-1
lines changed

‎.travis.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,39 @@ env:
66
- VERSION=7.4-rc VARIANT=stretch/apache
77
- VERSION=7.4-rc VARIANT=stretch/fpm
88
- VERSION=7.4-rc VARIANT=stretch/zts
9+
- VERSION=7.4-rc VARIANT=alpine3.10/cli
10+
- VERSION=7.4-rc VARIANT=alpine3.10/fpm
11+
- VERSION=7.4-rc VARIANT=alpine3.10/zts
912
- VERSION=7.4-rc VARIANT=alpine3.9/cli
1013
- VERSION=7.4-rc VARIANT=alpine3.9/fpm
1114
- VERSION=7.4-rc VARIANT=alpine3.9/zts
1215
- VERSION=7.3 VARIANT=stretch/cli
1316
- VERSION=7.3 VARIANT=stretch/apache
1417
- VERSION=7.3 VARIANT=stretch/fpm
1518
- VERSION=7.3 VARIANT=stretch/zts
19+
- VERSION=7.3 VARIANT=alpine3.10/cli
20+
- VERSION=7.3 VARIANT=alpine3.10/fpm
21+
- VERSION=7.3 VARIANT=alpine3.10/zts
1622
- VERSION=7.3 VARIANT=alpine3.9/cli
1723
- VERSION=7.3 VARIANT=alpine3.9/fpm
1824
- VERSION=7.3 VARIANT=alpine3.9/zts
1925
- VERSION=7.2 VARIANT=stretch/cli
2026
- VERSION=7.2 VARIANT=stretch/apache
2127
- VERSION=7.2 VARIANT=stretch/fpm
2228
- VERSION=7.2 VARIANT=stretch/zts
29+
- VERSION=7.2 VARIANT=alpine3.10/cli
30+
- VERSION=7.2 VARIANT=alpine3.10/fpm
31+
- VERSION=7.2 VARIANT=alpine3.10/zts
2332
- VERSION=7.2 VARIANT=alpine3.9/cli
2433
- VERSION=7.2 VARIANT=alpine3.9/fpm
2534
- VERSION=7.2 VARIANT=alpine3.9/zts
2635
- VERSION=7.1 VARIANT=stretch/cli
2736
- VERSION=7.1 VARIANT=stretch/apache
2837
- VERSION=7.1 VARIANT=stretch/fpm
2938
- VERSION=7.1 VARIANT=stretch/zts
39+
- VERSION=7.1 VARIANT=alpine3.10/cli
40+
- VERSION=7.1 VARIANT=alpine3.10/fpm
41+
- VERSION=7.1 VARIANT=alpine3.10/zts
3042
- VERSION=7.1 VARIANT=alpine3.9/cli
3143
- VERSION=7.1 VARIANT=alpine3.9/fpm
3244
- VERSION=7.1 VARIANT=alpine3.9/zts

‎7.1/alpine3.10/cli/Dockerfile

Lines changed: 179 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,179 @@
1+
#
2+
# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
3+
#
4+
# PLEASE DO NOT EDIT IT DIRECTLY.
5+
#
6+
7+
FROM alpine:3.10
8+
9+
# dependencies required for running "phpize"
10+
# these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
11+
ENV PHPIZE_DEPS \
12+
autoconf \
13+
dpkg-dev dpkg \
14+
file \
15+
g++ \
16+
gcc \
17+
libc-dev \
18+
make \
19+
pkgconf \
20+
re2c
21+
22+
# persistent / runtime deps
23+
RUN apk add --no-cache \
24+
ca-certificates \
25+
curl \
26+
tar \
27+
xz \
28+
# https://github.com/docker-library/php/issues/494
29+
openssl
30+
31+
# ensure www-data user exists
32+
RUN set -x \
33+
&& addgroup -g 82 -S www-data \
34+
&& adduser -u 82 -D -S -G www-data www-data
35+
# 82 is the standard uid/gid for "www-data" in Alpine
36+
# https://git.alpinelinux.org/aports/tree/main/apache2/apache2.pre-install?h=3.9-stable
37+
# https://git.alpinelinux.org/aports/tree/main/lighttpd/lighttpd.pre-install?h=3.9-stable
38+
# https://git.alpinelinux.org/aports/tree/main/nginx/nginx.pre-install?h=3.9-stable
39+
40+
ENV PHP_INI_DIR /usr/local/etc/php
41+
RUN set -eux; \
42+
mkdir -p "$PHP_INI_DIR/conf.d"; \
43+
# allow running as an arbitrary user (https://github.com/docker-library/php/issues/743)
44+
[ ! -d /var/www/html ]; \
45+
mkdir -p /var/www/html; \
46+
chown www-data:www-data /var/www/html; \
47+
chmod 777 /var/www/html
48+
49+
##<autogenerated>##
50+
##</autogenerated>##
51+
52+
# Apply stack smash protection to functions using local buffers and alloca()
53+
# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
54+
# Enable optimization (-O2)
55+
# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
56+
# Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
57+
# https://github.com/docker-library/php/issues/272
58+
ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
59+
ENV PHP_CPPFLAGS="$PHP_CFLAGS"
60+
ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
61+
62+
ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 1729F83938DA44E27BA0F4D3DBDB397470D12172
63+
64+
ENV PHP_VERSION 7.1.30
65+
ENV PHP_URL="https://www.php.net/get/php-7.1.30.tar.xz/from/this/mirror" PHP_ASC_URL="https://www.php.net/get/php-7.1.30.tar.xz.asc/from/this/mirror"
66+
ENV PHP_SHA256="6310599811536dbe87e4bcf212bf93196bdfaff519d0c821e4c0068efd096a7c" PHP_MD5=""
67+
68+
RUN set -xe; \
69+
\
70+
apk add --no-cache --virtual .fetch-deps \
71+
gnupg \
72+
wget \
73+
; \
74+
\
75+
mkdir -p /usr/src; \
76+
cd /usr/src; \
77+
\
78+
wget -O php.tar.xz "$PHP_URL"; \
79+
\
80+
if [ -n "$PHP_SHA256" ]; then \
81+
echo "$PHP_SHA256 *php.tar.xz" | sha256sum -c -; \
82+
fi; \
83+
if [ -n "$PHP_MD5" ]; then \
84+
echo "$PHP_MD5 *php.tar.xz" | md5sum -c -; \
85+
fi; \
86+
\
87+
if [ -n "$PHP_ASC_URL" ]; then \
88+
wget -O php.tar.xz.asc "$PHP_ASC_URL"; \
89+
export GNUPGHOME="$(mktemp -d)"; \
90+
for key in $GPG_KEYS; do \
91+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
92+
done; \
93+
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
94+
command -v gpgconf > /dev/null && gpgconf --kill all; \
95+
rm -rf "$GNUPGHOME"; \
96+
fi; \
97+
\
98+
apk del --no-network .fetch-deps
99+
100+
COPY docker-php-source /usr/local/bin/
101+
102+
RUN set -xe \
103+
&& apk add --no-cache --virtual .build-deps \
104+
$PHPIZE_DEPS \
105+
coreutils \
106+
curl-dev \
107+
libedit-dev \
108+
libxml2-dev \
109+
openssl-dev \
110+
sqlite-dev \
111+
\
112+
&& export CFLAGS="$PHP_CFLAGS" \
113+
CPPFLAGS="$PHP_CPPFLAGS" \
114+
LDFLAGS="$PHP_LDFLAGS" \
115+
&& docker-php-source extract \
116+
&& cd /usr/src/php \
117+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
118+
&& ./configure \
119+
--build="$gnuArch" \
120+
--with-config-file-path="$PHP_INI_DIR" \
121+
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
122+
\
123+
# make sure invalid --configure-flags are fatal errors intead of just warnings
124+
--enable-option-checking=fatal \
125+
\
126+
# https://github.com/docker-library/php/issues/439
127+
--with-mhash \
128+
\
129+
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
130+
--enable-ftp \
131+
# --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)
132+
--enable-mbstring \
133+
# --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)
134+
--enable-mysqlnd \
135+
\
136+
--with-curl \
137+
--with-libedit \
138+
--with-openssl \
139+
--with-zlib \
140+
\
141+
# bundled pcre does not support JIT on s390x
142+
# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
143+
$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
144+
\
145+
$PHP_EXTRA_CONFIGURE_ARGS \
146+
&& make -j "$(nproc)" \
147+
&& find -type f -name '*.a' -delete \
148+
&& make install \
149+
&& { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \
150+
&& make clean \
151+
\
152+
# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable)
153+
&& cp -v php.ini-* "$PHP_INI_DIR/" \
154+
\
155+
&& cd / \
156+
&& docker-php-source delete \
157+
\
158+
&& runDeps="$( \
159+
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
160+
| tr ',' '\n' \
161+
| sort -u \
162+
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
163+
)" \
164+
&& apk add --no-cache $runDeps \
165+
\
166+
&& apk del --no-network .build-deps \
167+
\
168+
# update pecl channel definitions https://github.com/docker-library/php/issues/443
169+
&& pecl update-channels \
170+
&& rm -rf /tmp/pear ~/.pearrc \
171+
# smoke test
172+
&& php --version
173+
174+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
175+
176+
ENTRYPOINT ["docker-php-entrypoint"]
177+
##<autogenerated>##
178+
CMD ["php", "-a"]
179+
##</autogenerated>##

‎7.1/alpine3.10/cli/docker-php-entrypoint

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh
2+
set -e
3+
4+
# first arg is `-f` or `--some-option`
5+
if [ "${1#-}" != "$1" ]; then
6+
set -- php "$@"
7+
fi
8+
9+
exec "$@"

‎7.1/alpine3.10/cli/docker-php-ext-configure

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
#!/bin/sh
2+
set -e
3+
4+
# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
5+
: ${CFLAGS:=$PHP_CFLAGS}
6+
: ${CPPFLAGS:=$PHP_CPPFLAGS}
7+
: ${LDFLAGS:=$PHP_LDFLAGS}
8+
export CFLAGS CPPFLAGS LDFLAGS
9+
10+
srcExists=
11+
if [ -d /usr/src/php ]; then
12+
srcExists=1
13+
fi
14+
docker-php-source extract
15+
if [ -z "$srcExists" ]; then
16+
touch /usr/src/php/.docker-delete-me
17+
fi
18+
19+
cd /usr/src/php/ext
20+
21+
usage() {
22+
echo "usage: $0 ext-name [configure flags]"
23+
echo " ie: $0 gd --with-jpeg-dir=/usr/local/something"
24+
echo
25+
echo 'Possible values for ext-name:'
26+
find . \
27+
-mindepth 2 \
28+
-maxdepth 2 \
29+
-type f \
30+
-name 'config.m4' \
31+
| xargs -n1 dirname \
32+
| xargs -n1 basename \
33+
| sort \
34+
| xargs
35+
echo
36+
echo 'Some of the above modules are already compiled into PHP; please check'
37+
echo 'the output of "php -i" to see which modules are already loaded.'
38+
}
39+
40+
ext="$1"
41+
if [ -z "$ext" ] || [ ! -d "$ext" ]; then
42+
usage >&2
43+
exit 1
44+
fi
45+
shift
46+
47+
pm='unknown'
48+
if [ -e /lib/apk/db/installed ]; then
49+
pm='apk'
50+
fi
51+
52+
if [ "$pm" = 'apk' ]; then
53+
if \
54+
[ -n "$PHPIZE_DEPS" ] \
55+
&& ! apk info --installed .phpize-deps > /dev/null \
56+
&& ! apk info --installed .phpize-deps-configure > /dev/null \
57+
; then
58+
apk add --no-cache --virtual .phpize-deps-configure $PHPIZE_DEPS
59+
fi
60+
fi
61+
62+
if command -v dpkg-architecture > /dev/null; then
63+
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"
64+
set -- --build="$gnuArch" "$@"
65+
fi
66+
67+
cd "$ext"
68+
phpize
69+
./configure "$@"

0 commit comments

Comments
 (0)