Skip to content

Commit c41a6fc

Browse files
khs1994khs1994
committed
[php] update Dockerfile [sync git]
Signed-off-by: Kang Huaishuai <[email protected]>
1 parent d8294d7 commit c41a6fc

File tree

12 files changed

+30
-40
lines changed

12 files changed

+30
-40
lines changed

‎dockerfile/php/8.3/cli/Dockerfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -372,10 +372,9 @@ RUN --mount=type=bind,from=upstream,source=/usr/local/bin,target=/opt/bin,rw \
372372
set -x \
373373
&& export PATH=$PATH:/opt/bin:/opt/bin2 \
374374
&& curl -fsSL -o /tmp/igbinary.tar.gz https://github.com/igbinary/igbinary/archive/master.tar.gz \
375-
&& tar -zxvf /tmp/igbinary.tar.gz -C /tmp \
376-
&& mkdir -p /usr/src/php/ext \
375+
&& mkdir -p /usr/src/php/ext/igbinary \
377376
&& touch /usr/src/php/.docker-extracted \
378-
&& mv /tmp/igbinary-master /usr/src/php/ext/igbinary \
377+
&& tar -zxvf /tmp/igbinary.tar.gz -C /usr/src/php/ext/igbinary --strip 1 \
379378
&& docker-php-ext-configure igbinary \
380379
&& docker-php-ext-install igbinary \
381380
&& apk add --no-cache --virtual .pecl_build_deps $PECL_BUILD_DEPS $PHPIZE_DEPS \

‎dockerfile/php/8.3/swoole/Dockerfile‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ENV PECL_EXTENSION \
2424
swoole \
2525
${PECL_EXTENSION_EXTRA:-}
2626

27-
ENV SWOOLE_VERSION=6.0.2
27+
ENV SWOOLE_VERSION=v6.0.2
2828

2929
ARG ALPINE_URL=dl-cdn.alpinelinux.org
3030

@@ -36,11 +36,10 @@ RUN --mount=type=bind,from=upstream,source=/usr/local/bin,target=/opt/bin,rw \
3636
openssl-dev \
3737
pcre2-dev \
3838
&& export PATH=$PATH:/opt/bin \
39-
&& curl -fsSL -o /tmp/swoole.tar.gz https://github.com/swoole/swoole-src/archive/v${SWOOLE_VERSION}.tar.gz \
40-
&& tar -zxvf /tmp/swoole.tar.gz -C /tmp \
41-
&& mkdir -p /usr/src/php/ext \
39+
&& curl -fsSL -o /tmp/swoole.tar.gz https://github.com/swoole/swoole-src/archive/${SWOOLE_VERSION}.tar.gz \
40+
&& mkdir -p /usr/src/php/ext/swoole \
4241
&& touch /usr/src/php/.docker-extracted \
43-
&& mv /tmp/swoole-src-${SWOOLE_VERSION} /usr/src/php/ext/swoole \
42+
&& tar -zxvf /tmp/swoole.tar.gz -C /usr/src/php/ext/swoole --strip 1 \
4443
&& docker-php-ext-configure swoole --enable-openssl \
4544
&& docker-php-ext-install swoole \
4645
&& apk del --no-network .pecl_build_deps \

‎dockerfile/php/8.4/cli/Dockerfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -371,10 +371,9 @@ RUN --mount=type=bind,from=upstream,source=/usr/local/bin,target=/opt/bin,rw \
371371
set -x \
372372
&& export PATH=$PATH:/opt/bin:/opt/bin2 \
373373
&& curl -fsSL -o /tmp/igbinary.tar.gz https://github.com/igbinary/igbinary/archive/master.tar.gz \
374-
&& tar -zxvf /tmp/igbinary.tar.gz -C /tmp \
375-
&& mkdir -p /usr/src/php/ext \
374+
&& mkdir -p /usr/src/php/ext/igbinary \
376375
&& touch /usr/src/php/.docker-extracted \
377-
&& mv /tmp/igbinary-master /usr/src/php/ext/igbinary \
376+
&& tar -zxvf /tmp/igbinary.tar.gz -C /usr/src/php/ext/igbinary --strip 1 \
378377
&& docker-php-ext-configure igbinary \
379378
&& docker-php-ext-install igbinary \
380379
&& apk add --no-cache --virtual .pecl_build_deps $PECL_BUILD_DEPS $PHPIZE_DEPS \

‎dockerfile/php/8.4/fpm/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/,target=/opt/bin2,rw \
133133
# 安装内置扩展
134134
&& docker-php-source extract \
135135
&& curl -fsSL -o /tmp/igbinary.tar.gz https://github.com/igbinary/igbinary/archive/master.tar.gz \
136-
&& tar -zxvf /tmp/igbinary.tar.gz -C /usr/src/php/ext/ \
137-
&& mv /usr/src/php/ext/igbinary-master /usr/src/php/ext/igbinary \
136+
&& mkdir -p /usr/src/php/ext/igbinary \
137+
&& tar -zxvf /tmp/igbinary.tar.gz -C /usr/src/php/ext/igbinary --strip 1 \
138138
&& docker-php-ext-configure zip \
139139
--with-zip \
140140
&& docker-php-ext-configure gd \

‎dockerfile/php/8.4/swoole/Dockerfile‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ENV PECL_EXTENSION \
2424
swoole \
2525
${PECL_EXTENSION_EXTRA:-}
2626

27-
ENV SWOOLE_VERSION=6.0.2
27+
ENV SWOOLE_VERSION=v6.0.2
2828

2929
ARG ALPINE_URL=dl-cdn.alpinelinux.org
3030

@@ -36,11 +36,10 @@ RUN --mount=type=bind,from=upstream,source=/usr/local/bin,target=/opt/bin,rw \
3636
openssl-dev \
3737
pcre2-dev \
3838
&& export PATH=$PATH:/opt/bin \
39-
&& curl -fsSL -o /tmp/swoole.tar.gz https://github.com/swoole/swoole-src/archive/v${SWOOLE_VERSION}.tar.gz \
40-
&& tar -zxvf /tmp/swoole.tar.gz -C /tmp \
41-
&& mkdir -p /usr/src/php/ext \
39+
&& curl -fsSL -o /tmp/swoole.tar.gz https://github.com/swoole/swoole-src/archive/${SWOOLE_VERSION}.tar.gz \
40+
&& mkdir -p /usr/src/php/ext/swoole \
4241
&& touch /usr/src/php/.docker-extracted \
43-
&& mv /tmp/swoole-src-${SWOOLE_VERSION} /usr/src/php/ext/swoole \
42+
&& tar -zxvf /tmp/swoole.tar.gz -C /usr/src/php/ext/swoole --strip 1 \
4443
&& docker-php-ext-configure swoole --enable-openssl \
4544
&& docker-php-ext-install swoole \
4645
&& apk del --no-network .pecl_build_deps \

‎dockerfile/php/8.4/zts/Dockerfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -393,10 +393,9 @@ RUN --mount=type=bind,from=upstream,source=/usr/local/bin,target=/opt/bin,rw \
393393
set -x \
394394
&& export PATH=$PATH:/opt/bin:/opt/bin2 \
395395
&& curl -fsSL -o /tmp/igbinary.tar.gz https://github.com/igbinary/igbinary/archive/master.tar.gz \
396-
&& tar -zxvf /tmp/igbinary.tar.gz -C /tmp \
397-
&& mkdir -p /usr/src/php/ext \
396+
&& mkdir -p /usr/src/php/ext/igbinary \
398397
&& touch /usr/src/php/.docker-extracted \
399-
&& mv /tmp/igbinary-master /usr/src/php/ext/igbinary \
398+
&& tar -zxvf /tmp/igbinary.tar.gz -C /usr/src/php/ext/igbinary --strip 1 \
400399
&& docker-php-ext-configure igbinary \
401400
&& docker-php-ext-install igbinary \
402401
&& apk add --no-cache --virtual .pecl_build_deps $PECL_BUILD_DEPS $PHPIZE_DEPS \

‎dockerfile/php/8.5/cli/Dockerfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -366,10 +366,9 @@ RUN --mount=type=bind,from=upstream,source=/usr/local/bin,target=/opt/bin,rw \
366366
set -x \
367367
&& export PATH=$PATH:/opt/bin:/opt/bin2 \
368368
&& curl -fsSL -o /tmp/igbinary.tar.gz https://github.com/igbinary/igbinary/archive/master.tar.gz \
369-
&& tar -zxvf /tmp/igbinary.tar.gz -C /tmp \
370-
&& mkdir -p /usr/src/php/ext \
369+
&& mkdir -p /usr/src/php/ext/igbinary \
371370
&& touch /usr/src/php/.docker-extracted \
372-
&& mv /tmp/igbinary-master /usr/src/php/ext/igbinary \
371+
&& tar -zxvf /tmp/igbinary.tar.gz -C /usr/src/php/ext/igbinary --strip 1 \
373372
&& docker-php-ext-configure igbinary \
374373
&& docker-php-ext-install igbinary \
375374
&& apk add --no-cache --virtual .pecl_build_deps $PECL_BUILD_DEPS $PHPIZE_DEPS \

‎dockerfile/php/8.5/fpm/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ RUN --mount=type=bind,from=ghcr.io/php/pie:nightly-bin,source=/,target=/opt/bin2
135135
# 安装内置扩展
136136
&& docker-php-source extract \
137137
&& curl -fsSL -o /tmp/igbinary.tar.gz https://github.com/igbinary/igbinary/archive/master.tar.gz \
138-
&& tar -zxvf /tmp/igbinary.tar.gz -C /usr/src/php/ext/ \
139-
&& mv /usr/src/php/ext/igbinary-master /usr/src/php/ext/igbinary \
138+
&& mkdir -p /usr/src/php/ext/igbinary \
139+
&& tar -zxvf /tmp/igbinary.tar.gz -C /usr/src/php/ext/igbinary --strip 1 \
140140
&& docker-php-ext-configure zip \
141141
--with-zip \
142142
&& docker-php-ext-configure gd \

‎dockerfile/php/8.5/swoole/Dockerfile‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ENV PECL_EXTENSION \
2424
swoole \
2525
${PECL_EXTENSION_EXTRA:-}
2626

27-
# ENV SWOOLE_VERSION=6.0.2
27+
# ENV SWOOLE_VERSION=v6.0.2
2828
ENV SWOOLE_VERSION=master
2929

3030
ARG ALPINE_URL=dl-cdn.alpinelinux.org
@@ -37,11 +37,10 @@ RUN --mount=type=bind,from=upstream,source=/usr/local/bin,target=/opt/bin,rw \
3737
openssl-dev \
3838
pcre2-dev \
3939
&& export PATH=$PATH:/opt/bin \
40-
&& curl -fsSL -o /tmp/swoole.tar.gz https://github.com/swoole/swoole-src/archive/v${SWOOLE_VERSION}.tar.gz \
41-
&& tar -zxvf /tmp/swoole.tar.gz -C /tmp \
42-
&& mkdir -p /usr/src/php/ext \
40+
&& curl -fsSL -o /tmp/swoole.tar.gz https://github.com/swoole/swoole-src/archive/${SWOOLE_VERSION}.tar.gz \
41+
&& mkdir -p /usr/src/php/ext/swoole \
4342
&& touch /usr/src/php/.docker-extracted \
44-
&& mv /tmp/swoole-src-${SWOOLE_VERSION} /usr/src/php/ext/swoole \
43+
&& tar -zxvf /tmp/swoole.tar.gz -C /usr/src/php/ext/swoole --strip 1 \
4544
&& docker-php-ext-configure swoole --enable-openssl \
4645
&& docker-php-ext-install swoole \
4746
&& apk del --no-network .pecl_build_deps \

‎dockerfile/php/8.5/zts/Dockerfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -388,10 +388,9 @@ RUN --mount=type=bind,from=upstream,source=/usr/local/bin,target=/opt/bin,rw \
388388
set -x \
389389
&& export PATH=$PATH:/opt/bin:/opt/bin2 \
390390
&& curl -fsSL -o /tmp/igbinary.tar.gz https://github.com/igbinary/igbinary/archive/master.tar.gz \
391-
&& tar -zxvf /tmp/igbinary.tar.gz -C /tmp \
392-
&& mkdir -p /usr/src/php/ext \
391+
&& mkdir -p /usr/src/php/ext/igbinary \
393392
&& touch /usr/src/php/.docker-extracted \
394-
&& mv /tmp/igbinary-master /usr/src/php/ext/igbinary \
393+
&& tar -zxvf /tmp/igbinary.tar.gz -C /usr/src/php/ext/igbinary --strip 1 \
395394
&& docker-php-ext-configure igbinary \
396395
&& docker-php-ext-install igbinary \
397396
&& apk add --no-cache --virtual .pecl_build_deps $PECL_BUILD_DEPS $PHPIZE_DEPS \

0 commit comments

Comments
 (0)