Skip to content

Commit c971a79

Browse files
committed
Sync from khs1994-docker/lnmp@9ea9f82 by PCIT
1 parent dc9d22f commit c971a79

File tree

4 files changed

+9
-15
lines changed

4 files changed

+9
-15
lines changed

.github/workflows/ci.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ jobs:
3131
# macOS
3232
- os: macos-latest
3333
docker_channel: stable
34-
docker_version: "20.10"
34+
docker_version: 20.10
3535
runs-on: ${{ matrix.os }}
36-
timeout-minutes: 20
36+
timeout-minutes: 11
3737
steps:
3838
- uses: actions/checkout@main
3939
with:
@@ -68,7 +68,7 @@ jobs:
6868
os:
6969
- ubuntu-latest
7070
- macos-latest
71-
timeout-minutes: 20
71+
timeout-minutes: 11
7272
defaults:
7373
run:
7474
shell: bash --noprofile --norc -exo pipefail {0}
@@ -153,7 +153,7 @@ jobs:
153153
uses: ./
154154
# uses: docker-practice/actions-setup-docker@master
155155
with:
156-
docker_nightly_version: snapshot-20201008
156+
docker_nightly_version: snapshot-20210202
157157
docker_channel: nightly
158158
- run: docker version
159159

README.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ Support **Linux** and **macOS**
88

99
* [action.yml](https://github.com/docker-practice/actions-setup-docker/blob/master/action.yml)
1010

11-
**Test with Latest Docker (Linux only)**
12-
13-
Thanks https://github.com/AkihiroSuda/moby-snapshot
11+
**Quick Start**
1412

1513
```yaml
1614
on:
@@ -23,10 +21,6 @@ jobs:
2321
runs-on: ubuntu-latest
2422
steps:
2523
- uses: docker-practice/actions-setup-docker@master
26-
with:
27-
docker_channel: nightly
28-
# this value please see https://github.com/AkihiroSuda/moby-snapshot/releases
29-
docker_nightly_version: snapshot-20201008
3024
- run: |
3125
set -x
3226

action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ inputs:
1111
docker_nightly_version:
1212
# https://github.com/AkihiroSuda/moby-snapshot/releases
1313
description: Docker nightly Version
14-
default: snapshot-20201008
14+
default: snapshot-20210202
1515
required: false
1616
docker_channel:
1717
# https://download.docker.com/linux/ubuntu/dists/focal/pool/

lib/setup-docker.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,10 +248,10 @@ echo "-- Docker is ready."
248248
await exec.exec('sudo', [
249249
'sh',
250250
'-c',
251-
"apt remove -y --no-upgrade moby-buildx moby-cli moby-containerd moby-engine moby-runc"
251+
"apt remove -y moby-buildx moby-cli moby-containerd moby-engine moby-runc"
252252
]).catch(() => { });
253253
core.endGroup();
254-
254+
255255
core.startGroup('update apt cache');
256256
await exec.exec('sudo', [
257257
'apt-get',
@@ -265,7 +265,7 @@ echo "-- Docker is ready."
265265
'-c',
266266
'apt-get install -y /tmp/*.deb'
267267
]).catch(async () => {
268-
core.startGroup('download libseccomp2_2.4.4-1~bpo10+1_amd64.deb deb for old os');
268+
core.startGroup('download libseccomp2_2.4.4 deb for old os');
269269
await exec.exec('curl', [
270270
'-fsSL',
271271
'-o',

0 commit comments

Comments
 (0)