Skip to content

Commit 7ec04de

Browse files
committed
[PHP] fixed nightly build
Signed-off-by: Kang Huaishuai <khs1994@khs1994.com>
1 parent 983d743 commit 7ec04de

File tree

3 files changed

+2
-11
lines changed

3 files changed

+2
-11
lines changed

.github/workflows/lwpm-dist-k8s-file.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ jobs:
4040
TENCENT_DOCKER_USERNAME: "906210846"
4141
TENCENT_DOCKER_REGISTRY: useccr.ccs.tencentyun.com
4242
run: |
43-
echo $env:LNMP_CN_ENV
44-
$env:LNMP_CN_ENV="false"
45-
4643
echo $ErrorActionPreference
4744
$ErrorActionPreference = "Continue"
4845
. ./lnmp/windows/sdk/dockerhub/rootfs.ps1
@@ -73,9 +70,6 @@ jobs:
7370
TENCENT_DOCKER_REGISTRY: useccr.ccs.tencentyun.com
7471
if: matrix.os == 'windows'
7572
run: |
76-
echo $env:LNMP_CN_ENV
77-
$env:LNMP_CN_ENV="false"
78-
7973
echo $ErrorActionPreference
8074
$ErrorActionPreference = "Continue"
8175
. ./lnmp/windows/sdk/dockerhub/rootfs.ps1
@@ -106,9 +100,6 @@ jobs:
106100
TENCENT_DOCKER_USERNAME: "906210846"
107101
TENCENT_DOCKER_REGISTRY: useccr.ccs.tencentyun.com
108102
run: |
109-
echo $env:LNMP_CN_ENV
110-
$env:LNMP_CN_ENV="false"
111-
112103
echo $ErrorActionPreference
113104
. ./lnmp/windows/sdk/dockerhub/rootfs.ps1
114105

dockerfile/php/nightly/cli/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ RUN --mount=type=bind,from=php:alpine,source=/usr/local/bin,target=/opt/bin,rw \
393393
&& touch /usr/src/php/.docker-extracted \
394394
&& mv /tmp/igbinary-master /usr/src/php/ext/igbinary \
395395
&& cd /usr/src/php/ext/igbinary \
396-
&& curl -f curl -fL https://patch-diff.githubusercontent.com/raw/igbinary/igbinary/pull/398.diff -O \
396+
&& curl -f curl -fL https://patch-diff.githubusercontent.com/raw/igbinary/igbinary/pull/398.diff -o 398.diff \
397397
&& apk add --no-cache patch \
398398
&& patch -p1 < 398.diff \
399399
&& apk del --no-network patch \

dockerfile/php/nightly/fpm/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ RUN --mount=type=bind,from=php:alpine,source=/usr/local/bin,target=/opt/bin,rw \
405405
&& touch /usr/src/php/.docker-extracted \
406406
&& mv /tmp/igbinary-master /usr/src/php/ext/igbinary \
407407
&& cd /usr/src/php/ext/igbinary \
408-
&& curl -f curl -fL https://patch-diff.githubusercontent.com/raw/igbinary/igbinary/pull/398.diff -O \
408+
&& curl -f curl -fL https://patch-diff.githubusercontent.com/raw/igbinary/igbinary/pull/398.diff -o 398.diff \
409409
&& apk add --no-cache patch \
410410
&& patch -p1 < 398.diff \
411411
&& apk del --no-network patch \

0 commit comments

Comments
 (0)