Skip to content

Commit 0634223

Browse files
committed
fix login
Signed-off-by: Abhradeep Chakraborty <[email protected]>
1 parent 6cc9ccb commit 0634223

File tree

3 files changed

+39
-42
lines changed

3 files changed

+39
-42
lines changed
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: 'Multi-Registry Docker Login'
2+
description: 'Authenticate with both GHCR and Google Artifact Registry'
3+
inputs:
4+
GITHUB_TOKEN:
5+
description: 'GitHub token for GHCR'
6+
required: true
7+
GCP_SA_KEY:
8+
description: 'Google Service Account JSON key'
9+
required: true
10+
11+
runs:
12+
using: "composite"
13+
steps:
14+
- name: Login to GHCR
15+
uses: docker/login-action@v3
16+
with:
17+
registry: ghcr.io
18+
username: ${{ github.repository_owner }}
19+
password: ${{ inputs.GITHUB_TOKEN }}
20+
21+
- name: Login to Google Artifact Registry
22+
uses: docker/login-action@v3
23+
with:
24+
registry: us-central1-docker.pkg.dev
25+
username: _json_key
26+
password: ${{ inputs.GCP_SA_KEY }}

.github/workflows/docker-dev-release.yml

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,10 @@ jobs:
4141
uses: docker/setup-buildx-action@v3
4242

4343
- name: Login to Registries
44-
uses: docker/login-action@v3
44+
uses: ./.github/actions/multi-registry-docker-login
4545
with:
46-
registry: |
47-
ghcr.io
48-
us-central1-docker.pkg.dev
49-
username: |
50-
${{ github.repository_owner }}
51-
_json_key
52-
password: |
53-
${{ secrets.GITHUB_TOKEN }}
54-
${{ secrets.GCP_SA_KEY }}
46+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
47+
GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }}
5548

5649
- name: Get Build Information
5750
id: build_info
@@ -117,19 +110,11 @@ jobs:
117110
matrix:
118111
flavor: [alpine,ubuntu]
119112
steps:
120-
- name: Login to GitHub Container Registry
121-
uses: docker/login-action@v3
122-
with:
123-
registry: ghcr.io
124-
username: ${{ github.repository_owner }}
125-
password: ${{ secrets.GITHUB_TOKEN }}
126-
127-
- name: Login to Gcp Artifact Registry
128-
uses: docker/login-action@v3
113+
- name: Login to Registries
114+
uses: ./.github/actions/multi-registry-docker-login
129115
with:
130-
registry: us-central1-docker.pkg.dev
131-
username: _json_key
132-
password: ${{ secrets.GCP_SA_KEY }}
116+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
117+
GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }}
133118

134119
- name: Merge and Push
135120
run: |

.github/workflows/docker-release2.yml

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,10 @@ jobs:
5252
uses: docker/setup-buildx-action@v3
5353

5454
- name: Login to Registries
55-
uses: docker/login-action@v3
55+
uses: ./.github/actions/multi-registry-docker-login
5656
with:
57-
registry: |
58-
ghcr.io
59-
us-central1-docker.pkg.dev
60-
username: |
61-
${{ github.repository_owner }}
62-
_json_key
63-
password: |
64-
${{ secrets.GITHUB_TOKEN }}
65-
${{ secrets.GCP_SA_KEY }}
57+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
58+
GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }}
6659

6760
- name: Fetch release asset
6861
uses: dsaltares/[email protected]
@@ -139,17 +132,10 @@ jobs:
139132
flavor: [ubuntu]
140133
steps:
141134
- name: Login to Registries
142-
uses: docker/login-action@v3
135+
uses: ./.github/actions/multi-registry-docker-login
143136
with:
144-
registry: |
145-
ghcr.io
146-
us-central1-docker.pkg.dev
147-
username: |
148-
${{ github.repository_owner }}
149-
_json_key
150-
password: |
151-
${{ secrets.GITHUB_TOKEN }}
152-
${{ secrets.GCP_SA_KEY }}
137+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
138+
GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }}
153139

154140
- name: Merge and Push
155141
run: |

0 commit comments

Comments
 (0)