Skip to content

Commit 87f2dce

Browse files
committed
Replace shell docker login to ACR with prexisting github action setup.
1 parent e66f12d commit 87f2dce

2 files changed

Lines changed: 12 additions & 8 deletions

File tree

.github/workflows/build.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,12 @@ jobs:
2323
IMAGE: fortiregistry.azurecr.io/${{ matrix.service }}:${{ github.run_id }}
2424
steps:
2525
- uses: actions/checkout@v4
26-
27-
- name: Log in to Azure Container Registry
28-
run: docker login -u ${{ secrets.AZURE_REGISTRY_USERNAME }} -p ${{ secrets.AZURE_REGISTRY_PASSWORD }} fortiregistry.azurecr.io
29-
26+
- name: Login to ACR
27+
uses: docker/login-action@v4
28+
with:
29+
registry: fortiregistry.azurecr.io
30+
username: ${{ secrets.AZURE_REGISTRY_USERNAME }}
31+
password: ${{ secrets.AZURE_REGISTRY_PASSWORD }}
3032
- name: Build and push
3133
run: |
3234
docker build -t $IMAGE -f ${{ matrix.service }}/build/package/Dockerfile .

.github/workflows/devcontainer.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/checkout@v4
12-
13-
- name: Log in to Azure Container Registry
14-
run: docker login -u ${{ secrets.AZURE_REGISTRY_USERNAME }} -p ${{ secrets.AZURE_REGISTRY_PASSWORD }} fortiregistry.azurecr.io
15-
12+
- name: Login to ACR
13+
uses: docker/login-action@v4
14+
with:
15+
registry: fortiregistry.azurecr.io
16+
username: ${{ secrets.AZURE_REGISTRY_USERNAME }}
17+
password: ${{ secrets.AZURE_REGISTRY_PASSWORD }}
1618
- name: Build and push
1719
run: |
1820
docker build -t fortiregistry.azurecr.io/devcontainer:latest -f .devcontainer/Dockerfile .

0 commit comments

Comments
 (0)