Skip to content

Commit cb640bb

Browse files
authored
quickstart linux 运行容器名称与默认保持一致 (#890)
1 parent 477cfbf commit cb640bb

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

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

+9-10
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ cd ${__DIR__}
1313

1414
{
1515
docker stop swoole-cli-alpine-dev
16+
docker stop swoole-cli-builder
1617
sleep 5
1718
} || {
1819
echo $?
@@ -21,7 +22,7 @@ cd ${__DIR__}
2122

2223
IMAGE=alpine:3.18
2324

24-
:<<'EOF'
25+
: <<'EOF'
2526
启动此容器
2627
2728
已经内置了 php 、composer 、 编译好的依赖库
@@ -51,31 +52,29 @@ case $ARCH in
5152
'x86_64')
5253
TAG=all-dependencies-alpine-3.18-php8-v1.0.0-x86_64-20240715T132512Z
5354
IMAGE=docker.io/jingjingxyk/build-swoole-cli:${TAG}
54-
if [ "$MIRROR" = 'china' ] ; then
55+
if [ "$MIRROR" = 'china' ]; then
5556
IMAGE=registry.cn-beijing.aliyuncs.com/jingjingxyk-public/app:${TAG}
5657
fi
5758
;;
5859
'aarch64')
5960
TAG=all-dependencies-alpine-3.18-php8-v1.0.0-aarch64-20240618T091126Z
6061
IMAGE=docker.io/jingjingxyk/build-swoole-cli:${TAG}
61-
if [ "$MIRROR" = 'china' ] ; then
62-
IMAGE=registry.cn-hangzhou.aliyuncs.com/jingjingxyk-public/app:${TAG}
63-
fi
62+
if [ "$MIRROR" = 'china' ]; then
63+
IMAGE=registry.cn-hangzhou.aliyuncs.com/jingjingxyk-public/app:${TAG}
64+
fi
6465
;;
6566
*)
6667
echo "${ARCH} 架构的容器 容器未配置"
6768
exit 0
6869
;;
6970
esac
7071

71-
7272
cd ${__DIR__}
7373

74-
if [ $DEV_SHM -eq 1 ] ; then
74+
if [ $DEV_SHM -eq 1 ]; then
7575
mkdir -p /dev/shm/swoole-cli/thirdparty/
7676
mkdir -p /dev/shm/swoole-cli/ext/
77-
docker run --rm --name swoole-cli-alpine-dev -d -v ${__PROJECT__}:/work -v /dev/shm/swoole-cli/thirdparty/:/work/thirdparty/ -v /dev/shm/swoole-cli/ext/:/work/ext/ -w /work --init $IMAGE tail -f /dev/null
77+
docker run --rm --name swoole-cli-builder -d -v ${__PROJECT__}:/work -v /dev/shm/swoole-cli/thirdparty/:/work/thirdparty/ -v /dev/shm/swoole-cli/ext/:/work/ext/ -w /work --init $IMAGE tail -f /dev/null
7878
else
79-
docker run --rm --name swoole-cli-alpine-dev -d -v ${__PROJECT__}:/work -w /work --init $IMAGE tail -f /dev/null
79+
docker run --rm --name swoole-cli-builder -d -v ${__PROJECT__}:/work -w /work --init $IMAGE tail -f /dev/null
8080
fi
81-

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ cd ${__DIR__}
1313

1414
{
1515
docker stop swoole-cli-alpine-dev
16+
docker stop swoole-cli-builder
1617
sleep 5
1718
} || {
1819
echo $?
@@ -37,4 +38,4 @@ while [ $# -gt 0 ]; do
3738
done
3839

3940
cd ${__DIR__}
40-
docker run --rm --name swoole-cli-alpine-dev -d -v ${__PROJECT__}:/work -w /work --init $IMAGE tail -f /dev/null
41+
docker run --rm --name swoole-cli-builder -d -v ${__PROJECT__}:/work -w /work --init $IMAGE tail -f /dev/null

0 commit comments

Comments
 (0)