Skip to content

Commit 0fd05e8

Browse files
trxcllnttrxcllnt
committed
hard-code ghcr.io and github.actor/token
1 parent a0f5043 commit 0fd05e8

5 files changed

Lines changed: 10 additions & 64 deletions

File tree

‎.github/actions/build-and-publish-image-ssh/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ runs:
9393
driver-opts: ${{ inputs.buildx-driver-opts }}
9494
- name: Login to container registry
9595
if: inputs.push == 'true'
96-
uses: docker/login-action@v1
96+
uses: docker/login-action@v2
9797
with:
9898
registry: ${{ inputs.registry-url }}
9999
username: ${{ inputs.registry-username }}

‎.github/actions/build-and-publish-image/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ runs:
7171
driver-opts: ${{ inputs.buildx-driver-opts }}
7272
- name: Login to container registry
7373
if: inputs.push == 'true'
74-
uses: docker/login-action@v1
74+
uses: docker/login-action@v2
7575
with:
7676
registry: ${{ inputs.registry-url }}
7777
username: ${{ inputs.registry-username }}

‎.github/workflows/build-and-push-image-ssh.yml‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,6 @@ on:
1515
file:
1616
type: string
1717
required: true
18-
registry-url:
19-
type: string
20-
required: true
21-
registry-username:
22-
type: string
23-
required: true
24-
registry-password:
25-
type: string
26-
required: true
2718
image:
2819
default: ""
2920
type: string
@@ -136,7 +127,7 @@ jobs:
136127
VERSION="$(cat lerna.json | jq -r '.version')"
137128
image_type="$(echo "${{ inputs.image }}" | cut -d'-' -f1)"
138129
image_name="$(echo "${{ inputs.image }}" | cut -d'-' -f2)"
139-
REPOSITORY="${{ inputs.registry-url }}/${{ github.repository }}"
130+
REPOSITORY="ghcr.io/${{ github.repository }}"
140131
CUDA_VERSION_MAJOR="$(echo "${{ matrix.CUDA }}" | cut -d'.' -f1)"
141132
CUDA_VERSION_MINOR="$(echo "${{ matrix.CUDA }}" | cut -d'.' -f2)"
142133
CUDA_VERSION_PATCH="$(echo "${{ matrix.CUDA }}" | cut -d'.' -f3)"
@@ -204,9 +195,9 @@ jobs:
204195
file: ${{ inputs.file }}
205196
temp: ${{ runner.temp }}
206197
tags: ${{ env.IMAGE_NAME }}
207-
registry-url: ${{ inputs.registry-url }}
208-
registry-username: ${{ inputs.registry-username }}
209-
registry-password: ${{ inputs.registry-password }}
198+
registry-url: ghcr.io
199+
registry-username: ${{ github.actor }}
200+
registry-password: ${{ github.token }}
210201
AWS_ACCESS_KEY_ID: "${{ secrets.AWS_ACCESS_KEY_ID }}"
211202
AWS_SECRET_ACCESS_KEY: "${{ secrets.AWS_SECRET_ACCESS_KEY }}"
212203
CUMLPRIMS_SSH_PRIVATE_DEPLOY_KEY: "${{ secrets.CUMLPRIMS_SSH_PRIVATE_DEPLOY_KEY }}"

‎.github/workflows/build-and-push-image.yml‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,6 @@ on:
66
file:
77
type: string
88
required: true
9-
registry-url:
10-
type: string
11-
required: true
12-
registry-username:
13-
type: string
14-
required: true
15-
registry-password:
16-
type: string
17-
required: true
189
image:
1910
default: ""
2011
type: string
@@ -127,7 +118,7 @@ jobs:
127118
VERSION="$(cat lerna.json | jq -r '.version')"
128119
image_type="$(echo "${{ inputs.image }}" | cut -d'-' -f1)"
129120
image_name="$(echo "${{ inputs.image }}" | cut -d'-' -f2)"
130-
REPOSITORY="${{ inputs.registry-url }}/${{ github.repository }}"
121+
REPOSITORY="ghcr.io/${{ github.repository }}"
131122
CUDA_VERSION_MAJOR="$(echo "${{ matrix.CUDA }}" | cut -d'.' -f1)"
132123
CUDA_VERSION_MINOR="$(echo "${{ matrix.CUDA }}" | cut -d'.' -f2)"
133124
CUDA_VERSION_PATCH="$(echo "${{ matrix.CUDA }}" | cut -d'.' -f3)"
@@ -193,9 +184,9 @@ jobs:
193184
push: ${{ inputs.push }}
194185
file: ${{ inputs.file }}
195186
tags: ${{ env.IMAGE_NAME }}
196-
registry-url: ${{ inputs.registry-url }}
197-
registry-username: ${{ inputs.registry-username }}
198-
registry-password: ${{ inputs.registry-password }}
187+
registry-url: ghcr.io
188+
registry-username: ${{ github.actor }}
189+
registry-password: ${{ github.token }}
199190
build-args: |
200191
${{ env.BUILD_ARGS }}
201192
"NODE_VERSION=${{ env.NODE }}"

‎.github/workflows/merge.pr.yml‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ jobs:
1919
with:
2020
image: devel-main
2121
file: dev/dockerfiles/devel/main.Dockerfile
22-
registry-url: ghcr.io
23-
registry-username: ${{ github.repository_owner }}
24-
registry-password: ${{ github.token }}
2522
manual-build: ${{ github.event_name == 'workflow_dispatch' }}
2623
files-to-diff: |
2724
(\.npmrc|modules|yarn\.lock|package\.json)
@@ -38,9 +35,6 @@ jobs:
3835
from_: devel-main
3936
image: devel-packages
4037
file: dev/dockerfiles/devel/package.Dockerfile
41-
registry-url: ghcr.io
42-
registry-username: ${{ github.repository_owner }}
43-
registry-password: ${{ github.token }}
4438
manual-build: ${{ github.event_name == 'workflow_dispatch' }}
4539
files-to-diff: |
4640
dev/dockerfiles/devel/main\.Dockerfile
@@ -61,9 +55,6 @@ jobs:
6155
image: runtime-base
6256
devel: devel-main
6357
file: dev/dockerfiles/runtime/base.Dockerfile
64-
registry-url: ghcr.io
65-
registry-username: ${{ github.repository_owner }}
66-
registry-password: ${{ github.token }}
6758
manual-build: ${{ github.event_name == 'workflow_dispatch' }}
6859
build-args: |
6960
"UID=1000"
@@ -81,9 +72,6 @@ jobs:
8172
build: devel-packages
8273
devel: devel-main
8374
file: dev/dockerfiles/runtime/cudf.Dockerfile
84-
registry-url: ghcr.io
85-
registry-username: ${{ github.repository_owner }}
86-
registry-password: ${{ github.token }}
8775
files-to-diff: |
8876
\.npmrc
8977
modules/(core|rmm|cuda|cudf)
@@ -102,9 +90,6 @@ jobs:
10290
build: devel-packages
10391
devel: devel-main
10492
file: dev/dockerfiles/runtime/cuml.Dockerfile
105-
registry-url: ghcr.io
106-
registry-username: ${{ github.repository_owner }}
107-
registry-password: ${{ github.token }}
10893
files-to-diff: |
10994
\.npmrc
11095
modules/(core|rmm|cuda|cudf|cuml)
@@ -123,9 +108,6 @@ jobs:
123108
build: devel-packages
124109
devel: devel-main
125110
file: dev/dockerfiles/runtime/cugraph.Dockerfile
126-
registry-url: ghcr.io
127-
registry-username: ${{ github.repository_owner }}
128-
registry-password: ${{ github.token }}
129111
files-to-diff: |
130112
\.npmrc
131113
modules/(core|rmm|cuda|cudf|cugraph)
@@ -144,9 +126,6 @@ jobs:
144126
build: devel-packages
145127
devel: devel-main
146128
file: dev/dockerfiles/runtime/cuspatial.Dockerfile
147-
registry-url: ghcr.io
148-
registry-username: ${{ github.repository_owner }}
149-
registry-password: ${{ github.token }}
150129
files-to-diff: |
151130
\.npmrc
152131
modules/(core|rmm|cuda|cudf|cuspatial)
@@ -165,9 +144,6 @@ jobs:
165144
build: devel-packages
166145
devel: devel-main
167146
file: dev/dockerfiles/runtime/glfw.Dockerfile
168-
registry-url: ghcr.io
169-
registry-username: ${{ github.repository_owner }}
170-
registry-password: ${{ github.token }}
171147
files-to-diff: |
172148
\.npmrc
173149
modules/(core|glfw|webgl)
@@ -186,9 +162,6 @@ jobs:
186162
build: devel-packages
187163
devel: devel-main
188164
file: dev/dockerfiles/runtime/sql.Dockerfile
189-
registry-url: ghcr.io
190-
registry-username: ${{ github.repository_owner }}
191-
registry-password: ${{ github.token }}
192165
files-to-diff: |
193166
\.npmrc
194167
modules/(core|rmm|cuda|cudf|sql)
@@ -209,9 +182,6 @@ jobs:
209182
build: devel-packages
210183
devel: devel-main
211184
file: dev/dockerfiles/runtime/main.Dockerfile
212-
registry-url: ghcr.io
213-
registry-username: ${{ github.repository_owner }}
214-
registry-password: ${{ github.token }}
215185
files-to-diff: |
216186
\.npmrc
217187
modules/(core|cuda|glfw|webgl|rmm|cudf|sql|cuml|cugraph|cuspatial|deck\.gl|jsdom)
@@ -232,9 +202,6 @@ jobs:
232202
build: devel-packages
233203
devel: devel-main
234204
file: dev/dockerfiles/runtime/demo.Dockerfile
235-
registry-url: ghcr.io
236-
registry-username: ${{ github.repository_owner }}
237-
registry-password: ${{ github.token }}
238205
files-to-diff: |
239206
\.npmrc
240207
modules/demo
@@ -252,9 +219,6 @@ jobs:
252219
from_: runtime-demo
253220
image: runtime-notebook
254221
file: dev/dockerfiles/runtime/notebook.Dockerfile
255-
registry-url: ghcr.io
256-
registry-username: ${{ github.repository_owner }}
257-
registry-password: ${{ github.token }}
258222
files-to-diff: |
259223
\.npmrc
260224
**/*\.ipynb

0 commit comments

Comments
 (0)