Skip to content

Commit af7d5cf

Browse files
committed
Sync from khs1994-docker/lnmp@a87bc5e by PCIT
1 parent 5adf850 commit af7d5cf

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

.github/workflows/ci.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,13 @@ jobs:
4141
- uses: actions/checkout@main
4242
with:
4343
fetch-depth: 2
44+
- uses: azure/docker-login@v1
45+
if: |
46+
github.event_name == 'push'
47+
with:
48+
# login-server: contoso.azurecr.io
49+
username: ${{ secrets.DOCKER_USERNAME }}
50+
password: ${{ secrets.DOCKER_PASSWORD }}
4451
- name: setup Docker
4552
uses: ./
4653
# uses: docker-practice/actions-setup-docker@master
@@ -138,6 +145,13 @@ jobs:
138145
- uses: actions/checkout@main
139146
with:
140147
fetch-depth: 2
148+
- uses: azure/docker-login@v1
149+
if: |
150+
github.event_name == 'push'
151+
with:
152+
# login-server: contoso.azurecr.io
153+
username: ${{ secrets.DOCKER_USERNAME }}
154+
password: ${{ secrets.DOCKER_PASSWORD }}
141155
- name: setup docker
142156
uses: ./
143157
# uses: docker-practice/actions-setup-docker@master

lib/setup-docker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ echo "-- Docker is ready."
307307
await exec.exec('sudo', [
308308
'add-apt-repository',
309309
`deb [arch=amd64,arm64] https://download.docker.com/linux/ubuntu ${UBUNTU_CODENAME} ${DOCKER_CHANNEL}`,
310-
]).catch(()=>{ });
310+
]);
311311
core.endGroup();
312312

313313
message = 'update apt cache'

0 commit comments

Comments
 (0)