Skip to content

Commit efec15b

Browse files
committed
Sync from khs1994-docker/lnmp@bd60c13 by PCIT
1 parent c971a79 commit efec15b

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 3 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: 11
36+
timeout-minutes: 20
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: 11
71+
timeout-minutes: 20
7272
defaults:
7373
run:
7474
shell: bash --noprofile --norc -exo pipefail {0}

lib/setup-docker.js

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,12 @@ async function buildx() {
7575
'--driver',
7676
'docker-container',
7777
'--driver-opt',
78-
'image=moby/buildkit:master'
78+
// 'image=moby/buildkit:master'
79+
// moby/buildkit:buildx-stable-1
80+
'image=ghcr.io/dpsigs/moby-buildkit:master'
81+
// $ docker pull moby/buildkit:master
82+
// $ docker tag moby/buildkit:master ghcr.io/dpsigs/moby-buildkit:master
83+
// $ docker push ghcr.io/dpsigs/moby-buildkit:master
7984
]);
8085
core.endGroup();
8186

@@ -265,13 +270,6 @@ echo "-- Docker is ready."
265270
'-c',
266271
'apt-get install -y /tmp/*.deb'
267272
]).catch(async () => {
268-
core.startGroup('download libseccomp2_2.4.4 deb for old os');
269-
await exec.exec('curl', [
270-
'-fsSL',
271-
'-o',
272-
'/tmp/libseccomp2_2.4.4-1~bpo10+1_amd64.deb',
273-
'http://ftp.us.debian.org/debian/pool/main/libs/libseccomp/libseccomp2_2.4.4-1~bpo10+1_amd64.deb'
274-
]);
275273
core.endGroup();
276274

277275
core.startGroup('install docker');

0 commit comments

Comments
 (0)