Skip to content

Commit 9721ac6

Browse files
committed
Merge branch 'experiment-feature' into build_native_php
2 parents fa6ba49 + dd2a8fc commit 9721ac6

File tree

4 files changed

+0
-44
lines changed

4 files changed

+0
-44
lines changed

sapi/docker/build-export-container.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,6 @@ while [ $# -gt 0 ]; do
4949
shift $(($# > 0 ? 1 : 0))
5050
done
5151

52-
case "$MIRROR" in
53-
china | openatom)
54-
CONTAINER_BASE_IMAGE="docker.io/library/alpine:3.18"
55-
;;
56-
esac
57-
5852
mkdir -p var/build-export-container/
5953
cd ${__PROJECT__}/var/build-export-container/
6054

sapi/quickstart/linux/run-alpine-container.sh

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,5 @@ cd ${__DIR__}
2121

2222
IMAGE=alpine:3.18
2323

24-
MIRROR=''
25-
while [ $# -gt 0 ]; do
26-
case "$1" in
27-
--mirror)
28-
MIRROR="$2"
29-
case "$MIRROR" in
30-
china | openatom)
31-
IMAGE="docker.io/library/alpine:3.18"
32-
;;
33-
esac
34-
;;
35-
esac
36-
shift $(($# > 0 ? 1 : 0))
37-
done
38-
3924
cd ${__DIR__}
4025
docker run --rm --name swoole-cli-alpine-dev -d -v ${__PROJECT__}:/work -w /work --init $IMAGE tail -f /dev/null

sapi/quickstart/linux/run-debian-container.sh

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,5 @@ cd ${__DIR__}
2121

2222
IMAGE=debian:12
2323

24-
MIRROR=''
25-
while [ $# -gt 0 ]; do
26-
case "$1" in
27-
--mirror)
28-
MIRROR="$2"
29-
case "$MIRROR" in
30-
china | openatom)
31-
IMAGE="docker.io/library/debian:12"
32-
;;
33-
esac
34-
;;
35-
esac
36-
shift $(($# > 0 ? 1 : 0))
37-
done
38-
3924
cd ${__DIR__}
4025
docker run --rm --name swoole-cli-debian-dev -d -v ${__PROJECT__}:/work -w /work --init $IMAGE tail -f /dev/null

sapi/src/template/make.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -511,14 +511,6 @@
511511
if [ "$1" = "docker-build" ] ;then
512512
MIRROR=""
513513
CONTAINER_BASE_IMAGE='docker.io/library/alpine:3.18'
514-
if [ -n "$2" ]; then
515-
MIRROR=$2
516-
case "$MIRROR" in
517-
china | openatom)
518-
CONTAINER_BASE_IMAGE="docker.io/library/alpine:3.18"
519-
;;
520-
esac
521-
fi
522514
PLATFORM=''
523515
ARCH=$(uname -m)
524516
case $ARCH in

0 commit comments

Comments
 (0)