Skip to content

Commit ffe24cb

Browse files
committed
Regenerate PHP Dockerfiles
1 parent 2acdfb4 commit ffe24cb

40 files changed

Lines changed: 563 additions & 200 deletions

File tree

‎docker/php-apache-dev/8.1-alpine/Dockerfile‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
1515

1616
COPY conf/ /opt/docker/
1717

18-
RUN set -x \
18+
RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \
19+
set -x \
1920
# Install development environment
2021
&& bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
2122
&& blackfire php:install \
@@ -24,12 +25,18 @@ RUN set -x \
2425
make \
2526
autoconf \
2627
g++ \
27-
&& pecl install xdebug \
28+
libtool \
29+
pkgconf \
30+
&& PIE_WORKING_DIRECTORY=/tmp/pie pie install --no-interaction --no-cache \
31+
--skip-enable-extension --make-parallel-jobs="$(nproc)" xdebug/xdebug \
32+
&& rm -rf /tmp/pie \
2833
&& apk del -f --purge \
2934
autoconf \
3035
linux-headers \
3136
g++ \
3237
make \
38+
libtool \
39+
pkgconf \
3340
&& docker-php-ext-enable xdebug \
3441
# Enable php development services
3542
&& docker-service enable syslog \

‎docker/php-apache-dev/8.1/Dockerfile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,17 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
1515

1616
COPY conf/ /opt/docker/
1717

18-
RUN set -x \
18+
RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \
19+
set -x \
1920
# Install development environment
2021
&& BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
2122
&& blackfire php:install \
2223
&& echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
2324
&& wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
2425
&& apt-install tideways-php tideways-daemon \
25-
&& pecl install xdebug \
26+
&& PIE_WORKING_DIRECTORY=/tmp/pie pie install --no-interaction --no-cache \
27+
--skip-enable-extension --make-parallel-jobs="$(nproc)" xdebug/xdebug \
28+
&& rm -rf /tmp/pie \
2629
&& docker-php-ext-enable xdebug \
2730
# Enable php development services
2831
&& docker-service enable syslog \

‎docker/php-apache-dev/8.2-alpine/Dockerfile‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
1515

1616
COPY conf/ /opt/docker/
1717

18-
RUN set -x \
18+
RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \
19+
set -x \
1920
# Install development environment
2021
&& bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
2122
&& blackfire php:install \
@@ -24,12 +25,18 @@ RUN set -x \
2425
make \
2526
autoconf \
2627
g++ \
27-
&& pecl install xdebug \
28+
libtool \
29+
pkgconf \
30+
&& PIE_WORKING_DIRECTORY=/tmp/pie pie install --no-interaction --no-cache \
31+
--skip-enable-extension --make-parallel-jobs="$(nproc)" xdebug/xdebug \
32+
&& rm -rf /tmp/pie \
2833
&& apk del -f --purge \
2934
autoconf \
3035
linux-headers \
3136
g++ \
3237
make \
38+
libtool \
39+
pkgconf \
3340
&& docker-php-ext-enable xdebug \
3441
# Enable php development services
3542
&& docker-service enable syslog \

‎docker/php-apache-dev/8.2/Dockerfile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,17 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
1515

1616
COPY conf/ /opt/docker/
1717

18-
RUN set -x \
18+
RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \
19+
set -x \
1920
# Install development environment
2021
&& BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
2122
&& blackfire php:install \
2223
&& echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
2324
&& wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
2425
&& apt-install tideways-php tideways-daemon \
25-
&& pecl install xdebug \
26+
&& PIE_WORKING_DIRECTORY=/tmp/pie pie install --no-interaction --no-cache \
27+
--skip-enable-extension --make-parallel-jobs="$(nproc)" xdebug/xdebug \
28+
&& rm -rf /tmp/pie \
2629
&& docker-php-ext-enable xdebug \
2730
# Enable php development services
2831
&& docker-service enable syslog \

‎docker/php-apache-dev/8.3-alpine/Dockerfile‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
1515

1616
COPY conf/ /opt/docker/
1717

18-
RUN set -x \
18+
RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \
19+
set -x \
1920
# Install development environment
2021
&& bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
2122
&& blackfire php:install \
@@ -24,12 +25,18 @@ RUN set -x \
2425
make \
2526
autoconf \
2627
g++ \
27-
&& pecl install xdebug \
28+
libtool \
29+
pkgconf \
30+
&& PIE_WORKING_DIRECTORY=/tmp/pie pie install --no-interaction --no-cache \
31+
--skip-enable-extension --make-parallel-jobs="$(nproc)" xdebug/xdebug \
32+
&& rm -rf /tmp/pie \
2833
&& apk del -f --purge \
2934
autoconf \
3035
linux-headers \
3136
g++ \
3237
make \
38+
libtool \
39+
pkgconf \
3340
&& docker-php-ext-enable xdebug \
3441
# Enable php development services
3542
&& docker-service enable syslog \

‎docker/php-apache-dev/8.3/Dockerfile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,17 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
1515

1616
COPY conf/ /opt/docker/
1717

18-
RUN set -x \
18+
RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \
19+
set -x \
1920
# Install development environment
2021
&& BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
2122
&& blackfire php:install \
2223
&& echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
2324
&& wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
2425
&& apt-install tideways-php tideways-daemon \
25-
&& pecl install xdebug \
26+
&& PIE_WORKING_DIRECTORY=/tmp/pie pie install --no-interaction --no-cache \
27+
--skip-enable-extension --make-parallel-jobs="$(nproc)" xdebug/xdebug \
28+
&& rm -rf /tmp/pie \
2629
&& docker-php-ext-enable xdebug \
2730
# Enable php development services
2831
&& docker-service enable syslog \

‎docker/php-apache-dev/8.4-alpine/Dockerfile‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
1515

1616
COPY conf/ /opt/docker/
1717

18-
RUN set -x \
18+
RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \
19+
set -x \
1920
# Install development environment
2021
&& bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
2122
&& blackfire php:install \
@@ -24,12 +25,18 @@ RUN set -x \
2425
make \
2526
autoconf \
2627
g++ \
27-
&& pecl install xdebug \
28+
libtool \
29+
pkgconf \
30+
&& PIE_WORKING_DIRECTORY=/tmp/pie pie install --no-interaction --no-cache \
31+
--skip-enable-extension --make-parallel-jobs="$(nproc)" xdebug/xdebug \
32+
&& rm -rf /tmp/pie \
2833
&& apk del -f --purge \
2934
autoconf \
3035
linux-headers \
3136
g++ \
3237
make \
38+
libtool \
39+
pkgconf \
3340
&& docker-php-ext-enable xdebug \
3441
# Enable php development services
3542
&& docker-service enable syslog \

‎docker/php-apache-dev/8.4/Dockerfile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,17 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
1515

1616
COPY conf/ /opt/docker/
1717

18-
RUN set -x \
18+
RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \
19+
set -x \
1920
# Install development environment
2021
&& BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
2122
&& blackfire php:install \
2223
&& echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
2324
&& wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
2425
&& apt-install tideways-php tideways-daemon \
25-
&& pecl install xdebug \
26+
&& PIE_WORKING_DIRECTORY=/tmp/pie pie install --no-interaction --no-cache \
27+
--skip-enable-extension --make-parallel-jobs="$(nproc)" xdebug/xdebug \
28+
&& rm -rf /tmp/pie \
2629
&& docker-php-ext-enable xdebug \
2730
# Enable php development services
2831
&& docker-service enable syslog \

‎docker/php-apache-dev/8.5-alpine/Dockerfile‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
1515

1616
COPY conf/ /opt/docker/
1717

18-
RUN set -x \
18+
RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \
19+
set -x \
1920
# Install development environment
2021
&& bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
2122
&& blackfire php:install \
@@ -24,12 +25,18 @@ RUN set -x \
2425
make \
2526
autoconf \
2627
g++ \
27-
&& pecl install xdebug \
28+
libtool \
29+
pkgconf \
30+
&& PIE_WORKING_DIRECTORY=/tmp/pie pie install --no-interaction --no-cache \
31+
--skip-enable-extension --make-parallel-jobs="$(nproc)" xdebug/xdebug \
32+
&& rm -rf /tmp/pie \
2833
&& apk del -f --purge \
2934
autoconf \
3035
linux-headers \
3136
g++ \
3237
make \
38+
libtool \
39+
pkgconf \
3340
&& docker-php-ext-enable xdebug \
3441
# Enable php development services
3542
&& docker-service enable syslog \

‎docker/php-apache-dev/8.5/Dockerfile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,17 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
1515

1616
COPY conf/ /opt/docker/
1717

18-
RUN set -x \
18+
RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \
19+
set -x \
1920
# Install development environment
2021
&& BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
2122
&& blackfire php:install \
2223
&& echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
2324
&& wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
2425
&& apt-install tideways-php tideways-daemon \
25-
&& pecl install xdebug \
26+
&& PIE_WORKING_DIRECTORY=/tmp/pie pie install --no-interaction --no-cache \
27+
--skip-enable-extension --make-parallel-jobs="$(nproc)" xdebug/xdebug \
28+
&& rm -rf /tmp/pie \
2629
&& docker-php-ext-enable xdebug \
2730
# Enable php development services
2831
&& docker-service enable syslog \

0 commit comments

Comments
 (0)