Skip to content

Commit d72f58f

Browse files
committed
Sync from khs1994-docker/lnmp@5070c95 by PCIT
1 parent 6e8a2d6 commit d72f58f

File tree

9 files changed

+46
-30
lines changed

9 files changed

+46
-30
lines changed

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- uses: docker-practice/actions-setup-docker@master
24+
timeout-minutes: 12
2425
- run: |
2526
set -x
2627

lib/setup-docker.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ while ! /Applications/Docker.app/Contents/Resources/bin/docker system info &>/de
178178
command -v docker || echo 'test docker command loop: not found'
179179
sleep 1
180180
# wait 180s(3min)
181-
if [ $i -gt 180 ];then sudo /Applications/Docker.app/Contents/MacOS/com.docker.diagnose check;uname -a;echo "::error::-- Wait docker start $i s too long, exit"; exit 1; fi
181+
if [ $i -gt 180 ];then exit 1;sudo /Applications/Docker.app/Contents/MacOS/com.docker.diagnose check;uname -a;system_profiler SPHardwareDataType;echo "::error::-- Wait docker start $i s too long, exit"; exit 1; fi
182182
done
183183
echo "::notice::-- Docker is ready.Wait time is $i s"
184184
uname -a || true
@@ -341,7 +341,6 @@ system_profiler SPHardwareDataType || true
341341
]).catch(() => { });
342342
core.endGroup();
343343

344-
345344
message = 'install docker'
346345
core.debug(message);
347346
core.startGroup(message);

node_modules/.package-lock.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node_modules/@actions/core/lib/core.js

+17-18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node_modules/@actions/core/lib/core.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node_modules/@actions/core/lib/file-command.d.ts

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node_modules/@actions/core/lib/file-command.js

+19-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node_modules/@actions/core/lib/file-command.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node_modules/@actions/core/package.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)