Skip to content

Commit 9e50124

Browse files
scortellinoscortellino
authored
Merge pull request #13 from bandsintown/8.4.16-fpm
PHP 8.4.16
2 parents 148ea02 + de76646 commit 9e50124

7 files changed

Lines changed: 107 additions & 3 deletions

File tree

‎.buildkite/pipeline.master.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ steps:
99
hint: "Only the 5 latest versions are shown"
1010
required: true
1111
options:
12+
- label: v8.4.16-fpm
13+
value: 8.4.16-fpm
1214
- label: v8.3.6-fpm
1315
value: 8.3.6-fpm
1416

‎.buildkite/pipeline.pull_request.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ steps:
88
key: selected-version
99
required: true
1010
options:
11+
- label: v8.4.16-fpm
12+
value: 8.4.16-fpm
1113
- label: v8.3.6-fpm
1214
value: 8.3.6-fpm
1315
- label: v8.2.4-fpm

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
.idea
22
./bin/functions
3-
.env
3+
.env
4+
/.history

‎Dockerfile.template‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
FROM bandsintown/alpine:3.19.1 as builder
22

3+
FROM surnet/alpine-wkhtmltopdf:3.19.0-0.12.6-full as wkhtmltopdf
4+
35
FROM %%PARENT%%:%%VERSION_FULL%%-alpine
46

57
ENV S6_LOGGING=1 S6_OVERLAY_VERSION=1.19.1.1 GODNSMASQ_VERSION=1.0.7 CONSUL_TEMPLATE_VERSION=0.19.4 CONSUL_VERSION=0.8.4 MEMCACHED_DEPS="zlib-dev libmemcached-dev cyrus-sasl-dev" TZ="America/New_York"
@@ -38,9 +40,9 @@ RUN curl -Ls https://github.com/just-containers/s6-overlay/releases/download/v${
3840

3941
RUN mkdir /var/composer && \
4042
cd /var/composer && \
41-
php -r "copy('https://getcomposer.org/download/2.7.3/composer.phar', 'composer-setup.php');" && \
43+
php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \
4244
php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
43-
php composer-setup.php --install-dir=/usr/bin --filename=composer && \
45+
php composer-setup.php --version=2.9.3 --install-dir=/usr/bin --filename=composer && \
4446
php -r "unlink('composer-setup.php');"
4547

4648
COPY rootfs /

‎versions/8.4.16-fpm/Dockerfile‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
FROM bandsintown/alpine:3.19.1 as builder
2+
3+
FROM surnet/alpine-wkhtmltopdf:3.19.0-0.12.6-full as wkhtmltopdf
4+
5+
FROM php:8.4.16-fpm-alpine
6+
7+
ENV S6_LOGGING=1 S6_OVERLAY_VERSION=1.19.1.1 GODNSMASQ_VERSION=1.0.7 CONSUL_TEMPLATE_VERSION=0.19.4 CONSUL_VERSION=0.8.4 MEMCACHED_DEPS="zlib-dev libmemcached-dev cyrus-sasl-dev" TZ="America/New_York"
8+
9+
COPY --from=builder /usr/local/bin/consul /usr/local/bin/consul
10+
COPY --from=builder /usr/local/bin/consul-template /usr/local/bin/consul-template
11+
COPY --from=builder /usr/sbin/go-dnsmasq /usr/sbin/go-dnsmasq
12+
COPY --from=builder /etc/cont-init.d /etc/cont-init.d
13+
COPY --from=builder /etc/services.d /etc/services.d
14+
COPY --from=builder /root /root
15+
16+
RUN apk update && apk upgrade \
17+
&& apk add --update \
18+
coreutils \
19+
freetype-dev \
20+
libjpeg-turbo-dev \
21+
libltdl \
22+
libpng-dev \
23+
curl wget bash tree jq bind-tools su-exec build-base gcc autoconf \
24+
libmemcached-libs zlib \
25+
&& set -xe \
26+
&& apk add --virtual .phpize-deps $PHPIZE_DEPS \
27+
&& apk add --virtual .memcached-deps $MEMCACHED_DEPS \
28+
&& pecl install memcached-3.1.4 \
29+
&& echo "extension=memcached.so" > /usr/local/etc/php/conf.d/20_memcached.ini \
30+
&& pecl install memcache \
31+
&& echo "extension=memcache.so" > /usr/local/etc/php/conf.d/21_memcache.ini \
32+
&& docker-php-ext-install mysqli \
33+
&& docker-php-ext-configure gd --with-freetype --with-jpeg \
34+
&& docker-php-ext-install -j$(nproc) gd \
35+
&& rm -rf /usr/share/php8 \
36+
&& rm -rf /tmp/* \
37+
&& apk del .memcached-deps .phpize-deps
38+
39+
RUN curl -Ls https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-amd64.tar.gz | tar -xz -C /
40+
41+
RUN mkdir /var/composer && \
42+
cd /var/composer && \
43+
php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \
44+
php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
45+
php composer-setup.php --version=2.9.3 --install-dir=/usr/bin --filename=composer && \
46+
php -r "unlink('composer-setup.php');"
47+
48+
COPY rootfs /
49+
50+
RUN echo $TZ > /etc/timezone \
51+
&& touch /usr/local/var/run/php-fpm.pid \
52+
&& echo -ne "- with $(php -v | head -n 1)\n" >> /root/.built
53+
54+
EXPOSE 9000
55+
56+
# Workaround https://bugs.php.net/bug.php?id=71880
57+
ENV LOG_STREAM="/tmp/stdout"
58+
RUN mkfifo $LOG_STREAM && chmod 777 $LOG_STREAM
59+
60+
ENTRYPOINT ["/init"]
61+
CMD ["/bin/sh", "-c", "php-fpm --pid /usr/local/var/run/php-fpm.pid | tail -f $LOG_STREAM"]

‎versions/8.4.16-fpm/Dockerfile-tests‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
FROM bandsintown/php:8.4.16-fpm
2+
3+
ENV BATS_VERSION=0.4.0 DOCKERIZE_VERSION=v0.2.0
4+
5+
COPY tests /tests
6+
WORKDIR /tests
7+
8+
RUN exec 2>&1 && apk add --update bind-tools bc jq \
9+
&& curl -Ls https://codeload.github.com/sstephenson/bats/zip/v$BATS_VERSION -o /tmp/bats.zip \
10+
&& cd /tmp \
11+
&& unzip -q bats.zip \
12+
&& ./bats-${BATS_VERSION}/install.sh /usr/local \
13+
&& ln -sf /usr/local/libexec/bats /usr/local/bin/bats \
14+
&& wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
15+
&& tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
16+
&& rm -f bats.zip dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
17+
18+
CMD ["bash"]

‎versions/8.4.16-fpm/test/Dockerfile‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
FROM bandsintown/php:8.4.16-fpm
2+
3+
ENV BATS_VERSION=0.4.0 DOCKERIZE_VERSION=v0.2.0
4+
5+
COPY tests /tests
6+
WORKDIR /tests
7+
8+
RUN exec 2>&1 && apk add --update bind-tools bc jq \
9+
&& curl -Ls https://codeload.github.com/sstephenson/bats/zip/v$BATS_VERSION -o /tmp/bats.zip \
10+
&& cd /tmp \
11+
&& unzip -q bats.zip \
12+
&& ./bats-${BATS_VERSION}/install.sh /usr/local \
13+
&& ln -sf /usr/local/libexec/bats /usr/local/bin/bats \
14+
&& wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
15+
&& tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
16+
&& rm -f bats.zip dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
17+
18+
CMD ["bash"]

0 commit comments

Comments
 (0)