Skip to content

Commit 3e46fed

Browse files
committed
Swap to ghcr and clean up workflows
* Update checkout and docker login targets
1 parent 77eda88 commit 3e46fed

15 files changed

+51
-177
lines changed

.github/workflows/api-docs-repo.yaml

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
private-key: ${{ secrets.AUTOMATION_KEY }}
3131

3232
- name: Checkout code
33-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pinned to 4.1.7
33+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # pinned to 6.0.2
3434
with:
3535
ref: main
3636

@@ -42,36 +42,22 @@ jobs:
4242
branch: ${{ format('bot/update-api-docs-{0}', github.run_number) }}
4343

4444
- name: Checkout code
45-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pinned to 4.1.7
45+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # pinned to 6.0.2
4646
with:
4747
ref: ${{ format('bot/update-api-docs-{0}', github.run_number) }}
4848
fetch-depth: 0 # required to access tags
4949
submodules: "true"
5050

5151
- name: Log in to GitHub Docker Registry
52-
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # pinned to v3.3.0
52+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # pinned to v3.7.0
5353
with:
54-
registry: docker.pkg.github.com # ghcr.io not yet enabled for Azure org
54+
registry: ghcr.io
5555
username: ${{ github.actor }}
5656
password: ${{ secrets.GITHUB_TOKEN }}
5757

5858
- name: Build devcontainer image
59-
# We must issue a manual pull before the build so the image gets copied locally, because
60-
# docker.pkg.github.com is not a valid Docker registry and doesn't work with --cache-from,
61-
# however, `docker pull` will fall back to other methods that do work and get the image loaded.
62-
#
63-
# This message comes from "docker pull":
64-
#
65-
# Run docker pull docker.pkg.github.com/azure/azure-service-operator/aso-devcontainer:latest
66-
# WARNING: ⚠️ Failed to pull manifest by the resolved digest. This registry does not
67-
# appear to conform to the distribution registry specification; falling back to
68-
# pull by tag. This fallback is DEPRECATED, and will be removed in a future
69-
# release. Please contact admins of https://docker.pkg.github.com. ⚠️
70-
#
71-
# See: https://github.com/moby/moby/issues/41687#issuecomment-733826074 and related issues
7259
run: |
73-
docker pull docker.pkg.github.com/azure/azure-service-operator/aso-devcontainer:latest
74-
docker build --cache-from docker.pkg.github.com/azure/azure-service-operator/aso-devcontainer:latest --tag devcontainer:latest .devcontainer
60+
docker build --cache-from ghcr.io/azure/azure-service-operator/aso-devcontainer:latest --tag devcontainer:latest .devcontainer
7561
env:
7662
DOCKER_BUILDKIT: 1
7763

.github/workflows/build-devcontainer-image.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ jobs:
2929

3030
steps:
3131
- name: Checkout code
32-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pinned to 4.1.7
32+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # pinned to 6.0.2
3333

3434
- name: Log in to GitHub Docker Registry
35-
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # pinned to v3.3.0
35+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # pinned to v3.7.0
3636
with:
37-
registry: docker.pkg.github.com # ghcr.io not yet enabled for Azure org
37+
registry: ghcr.io
3838
username: ${{ github.actor }}
3939
password: ${{ secrets.GITHUB_TOKEN }}
4040

@@ -46,5 +46,5 @@ jobs:
4646
# Embed inline cache metadata so consumers can use --cache-from
4747
cache-to: type=inline
4848
tags: |
49-
docker.pkg.github.com/azure/azure-service-operator/aso-devcontainer:latest
50-
docker.pkg.github.com/azure/azure-service-operator/aso-devcontainer:${{ github.sha }}
49+
ghcr.io/azure/azure-service-operator/aso-devcontainer:latest
50+
ghcr.io/azure/azure-service-operator/aso-devcontainer:${{ github.sha }}

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646

4747
steps:
4848
- name: Checkout repository
49-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pinned to 4.1.7
49+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # pinned to 6.0.2
5050

5151
# Initializes the CodeQL tools for scanning.
5252
- name: Initialize CodeQL

.github/workflows/copilot-setup-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- name: Checkout code
23-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pinned to 4.1.7
23+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # pinned to 6.0.2
2424
with:
2525
fetch-depth: 0 # required to access tags
2626
submodules: 'true'

.github/workflows/create-release-experimental.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
steps:
2525
- name: Checkout code
26-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pinned to 4.1.7
26+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # pinned to 6.0.2
2727
with:
2828
fetch-depth: 0 # required to access tags
2929
submodules: "true"

.github/workflows/create-release-official.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
steps:
1818
- name: Checkout code
19-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pinned to 4.1.7
19+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # pinned to 6.0.2
2020
with:
2121
fetch-depth: 0 # required to access tags
2222
submodules: "true"

.github/workflows/deploy-site.yml

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,35 +35,21 @@ jobs:
3535
private-key: ${{ secrets.AUTOMATION_KEY }}
3636

3737
- name: Checkout code
38-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pinned to 4.1.7
38+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # pinned to 6.0.2
3939
with:
4040
fetch-depth: 0 # required to access tags
4141
submodules: "true"
4242

4343
- name: Log in to GitHub Docker Registry
44-
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # pinned to v3.3.0
44+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # pinned to v3.7.0
4545
with:
46-
registry: docker.pkg.github.com # ghcr.io not yet enabled for Azure org
46+
registry: ghcr.io
4747
username: ${{ github.actor }}
4848
password: ${{ secrets.GITHUB_TOKEN }}
4949

5050
- name: Build devcontainer image
51-
# We must issue a manual pull before the build so the image gets copied locally, because
52-
# docker.pkg.github.com is not a valid Docker registry and doesn't work with --cache-from,
53-
# however, `docker pull` will fall back to other methods that do work and get the image loaded.
54-
#
55-
# This message comes from "docker pull":
56-
#
57-
# Run docker pull docker.pkg.github.com/azure/azure-service-operator/aso-devcontainer:latest
58-
# WARNING: ⚠️ Failed to pull manifest by the resolved digest. This registry does not
59-
# appear to conform to the distribution registry specification; falling back to
60-
# pull by tag. This fallback is DEPRECATED, and will be removed in a future
61-
# release. Please contact admins of https://docker.pkg.github.com. ⚠️
62-
#
63-
# See: https://github.com/moby/moby/issues/41687#issuecomment-733826074 and related issues
6451
run: |
65-
docker pull docker.pkg.github.com/azure/azure-service-operator/aso-devcontainer:latest
66-
docker build --cache-from docker.pkg.github.com/azure/azure-service-operator/aso-devcontainer:latest --tag devcontainer:latest .devcontainer
52+
docker build --cache-from ghcr.io/azure/azure-service-operator/aso-devcontainer:latest --tag devcontainer:latest .devcontainer
6753
env:
6854
DOCKER_BUILDKIT: 1
6955

.github/workflows/helm-chart-repo.yaml

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
private-key: ${{ secrets.AUTOMATION_KEY }}
3737

3838
- name: Checkout code
39-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pinned to 4.1.7
39+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # pinned to 6.0.2
4040
with:
4141
ref: ${{ env.ref }}
4242
fetch-depth: 0 # required to access tags
@@ -55,36 +55,22 @@ jobs:
5555
sha: ${{ env.sha }}
5656

5757
- name: Checkout code
58-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pinned to 4.1.7
58+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # pinned to 6.0.2
5959
with:
6060
ref: ${{ format('bot/update-helm-chart-{0}', env.ref) }}
6161
fetch-depth: 0 # required to access tags
6262
submodules: 'true'
6363

6464
- name: Log in to GitHub Docker Registry
65-
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # pinned to v3.3.0
65+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # pinned to v3.7.0
6666
with:
67-
registry: docker.pkg.github.com # ghcr.io not yet enabled for Azure org
67+
registry: ghcr.io
6868
username: ${{ github.actor }}
6969
password: ${{ secrets.GITHUB_TOKEN }}
7070

7171
- name: Build devcontainer image
72-
# We must issue a manual pull before the build so the image gets copied locally, because
73-
# docker.pkg.github.com is not a valid Docker registry and doesn't work with --cache-from,
74-
# however, `docker pull` will fall back to other methods that do work and get the image loaded.
75-
#
76-
# This message comes from "docker pull":
77-
#
78-
# Run docker pull docker.pkg.github.com/azure/azure-service-operator/aso-devcontainer:latest
79-
# WARNING: ⚠️ Failed to pull manifest by the resolved digest. This registry does not
80-
# appear to conform to the distribution registry specification; falling back to
81-
# pull by tag. This fallback is DEPRECATED, and will be removed in a future
82-
# release. Please contact admins of https://docker.pkg.github.com. ⚠️
83-
#
84-
# See: https://github.com/moby/moby/issues/41687#issuecomment-733826074 and related issues
8572
run: |
86-
docker pull docker.pkg.github.com/azure/azure-service-operator/aso-devcontainer:latest
87-
docker build --cache-from docker.pkg.github.com/azure/azure-service-operator/aso-devcontainer:latest --tag devcontainer:latest .devcontainer
73+
docker build --cache-from ghcr.io/azure/azure-service-operator/aso-devcontainer:latest --tag devcontainer:latest .devcontainer
8874
env:
8975
DOCKER_BUILDKIT: 1
9076

.github/workflows/live-validation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Checkout code
22-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pinned to 4.1.7
22+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # pinned to 6.0.2
2323
with:
2424
fetch-depth: 0 # required to access tags
2525
submodules: "true"

.github/workflows/pr-validation-docs.yml

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,35 +21,21 @@ jobs:
2121

2222
steps:
2323
- name: Checkout code
24-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pinned to 4.1.7
24+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # pinned to 6.0.2
2525
with:
2626
fetch-depth: 0 # required to access tags
2727
submodules: "true"
2828

2929
- name: Log in to GitHub Docker Registry
30-
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # pinned to v3.3.0
30+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # pinned to v3.7.0
3131
with:
32-
registry: docker.pkg.github.com # ghcr.io not yet enabled for Azure org
32+
registry: ghcr.io
3333
username: ${{ github.actor }}
3434
password: ${{ secrets.GITHUB_TOKEN }}
3535

3636
- name: Build devcontainer image
37-
# We must issue a manual pull before the build so the image gets copied locally, because
38-
# docker.pkg.github.com is not a valid Docker registry and doesn't work with --cache-from,
39-
# however, `docker pull` will fall back to other methods that do work and get the image loaded.
40-
#
41-
# This message comes from "docker pull":
42-
#
43-
# Run docker pull docker.pkg.github.com/azure/azure-service-operator/aso-devcontainer:latest
44-
# WARNING: ⚠️ Failed to pull manifest by the resolved digest. This registry does not
45-
# appear to conform to the distribution registry specification; falling back to
46-
# pull by tag. This fallback is DEPRECATED, and will be removed in a future
47-
# release. Please contact admins of https://docker.pkg.github.com. ⚠️
48-
#
49-
# See: https://github.com/moby/moby/issues/41687#issuecomment-733826074 and related issues
5037
run: |
51-
docker pull docker.pkg.github.com/azure/azure-service-operator/aso-devcontainer:latest
52-
docker build --cache-from docker.pkg.github.com/azure/azure-service-operator/aso-devcontainer:latest --tag devcontainer:latest .devcontainer
38+
docker build --cache-from ghcr.io/azure/azure-service-operator/aso-devcontainer:latest --tag devcontainer:latest .devcontainer
5339
env:
5440
DOCKER_BUILDKIT: 1
5541

0 commit comments

Comments
 (0)