Skip to content

Commit c196202

Browse files
committed
merge code
2 parents f8aa17c + 7c8725e commit c196202

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.github/workflows/windows-cygwin.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
git config --global core.eol lf
2828
git config --global core.ignorecase false
2929
git config --global --add safe.directory ${{ github.workspace }}
30+
ipconfig
3031
3132
- uses: actions/checkout@v4
3233
- name: Prepare submodule

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ __PROJECT__=$(
1212
cd ${__DIR__}
1313

1414
{
15-
docker stop swoole-cli-builder
15+
docker stop swoole-cli-alpine-dev
1616
sleep 5
1717
} || {
1818
echo $?
@@ -73,7 +73,7 @@ cd ${__DIR__}
7373
if [ $DEV_SHM -eq 1 ]; then
7474
mkdir -p /dev/shm/swoole-cli/thirdparty/
7575
mkdir -p /dev/shm/swoole-cli/ext/
76-
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
76+
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
7777
else
78-
docker run --rm --name swoole-cli-builder -d -v ${__PROJECT__}:/work -w /work --init $IMAGE tail -f /dev/null
78+
docker run --rm --name swoole-cli-alpine-dev -d -v ${__PROJECT__}:/work -w /work --init $IMAGE tail -f /dev/null
7979
fi

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ __PROJECT__=$(
1212
cd ${__DIR__}
1313

1414
{
15-
docker stop swoole-cli-builder
15+
docker stop swoole-cli-alpine-dev
1616
sleep 5
1717
} || {
1818
echo $?
@@ -37,4 +37,4 @@ while [ $# -gt 0 ]; do
3737
done
3838

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

0 commit comments

Comments
 (0)