Skip to content

Commit fe2f62e

Browse files
committed
Remove hardcoded reference to repository owner from github actions
1 parent 3766b88 commit fe2f62e

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
id: meta_operator
3535
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96
3636
with:
37-
images: ${{ env.REGISTRY }}/halter/valkey-operator:${{ github.sha }}
37+
images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey-operator:${{ github.sha }}
3838
- name: Build Operator image
3939
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
4040
id: docker_build_operator

.github/workflows/image.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ jobs:
6161
id: meta_sidecar
6262
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96
6363
with:
64-
images: ${{ env.REGISTRY }}/halter/valkey-sidecar:${{ env.RELEASE_VERSION }}
64+
images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey-sidecar:${{ env.RELEASE_VERSION }}
6565
- name: Extract metadata (Valkey tags, labels) for Docker
6666
id: meta_valkey
6767
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96
6868
with:
69-
images: ${{ env.REGISTRY }}/halter/valkey:${{ env.VALKEY_VERSION }}
69+
images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey:${{ env.VALKEY_VERSION }}
7070

7171
- name: Setup Go ${{ matrix.go-version }}
7272
uses: actions/setup-go@v5
@@ -100,7 +100,7 @@ jobs:
100100
visibility: public
101101
platforms: ${{ matrix.platform }}
102102
labels: ${{ steps.meta_sidecar.outputs.labels }}
103-
outputs: type=image,"name=${{ env.REGISTRY }}/halter/valkey-sidecar",push-by-digest=true,name-canonical=true,push=true
103+
outputs: type=image,"name=${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey-sidecar",push-by-digest=true,name-canonical=true,push=true
104104
- name: Build and push Valkey image
105105
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
106106
id: docker_build_valkey
@@ -110,7 +110,7 @@ jobs:
110110
visibility: public
111111
platforms: ${{ matrix.platform }}
112112
labels: ${{ steps.meta_valkey.outputs.labels }}
113-
outputs: type=image,"name=${{ env.REGISTRY }}/halter/valkey",push-by-digest=true,name-canonical=true,push=true
113+
outputs: type=image,"name=${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey",push-by-digest=true,name-canonical=true,push=true
114114

115115
- name: Set up Cosign
116116
uses: sigstore/cosign-installer@d7d6bc7722e3daa8354c50bcb52f4837da5e9b6a # v3.8.1
@@ -120,10 +120,10 @@ jobs:
120120
cosign sign --yes ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.RELEASE_VERSION }}@${{ steps.docker_build_controller.outputs.digest }}
121121
- name: Sign Sidecar image with GitHub OIDC Token
122122
run: |
123-
cosign sign --yes ${{ env.REGISTRY }}/halter/valkey-sidecar:${{ env.RELEASE_VERSION }}@${{ steps.docker_build_sidecar.outputs.digest }}
123+
cosign sign --yes ${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey-sidecar:${{ env.RELEASE_VERSION }}@${{ steps.docker_build_sidecar.outputs.digest }}
124124
- name: Sign Valkey image with GitHub OIDC Token
125125
run: |
126-
cosign sign --yes ${{ env.REGISTRY }}/halter/valkey:${{ env.VALKEY_VERSION }}@${{ steps.docker_build_valkey.outputs.digest }}
126+
cosign sign --yes ${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey:${{ env.VALKEY_VERSION }}@${{ steps.docker_build_valkey.outputs.digest }}
127127
128128
- name: Attest the Controller image
129129
uses: actions/attest-build-provenance@v2
@@ -136,14 +136,14 @@ jobs:
136136
uses: actions/attest-build-provenance@v2
137137
id: attest_sidecar
138138
with:
139-
subject-name: ${{ env.REGISTRY }}/halter/valkey-sidecar
139+
subject-name: ${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey-sidecar
140140
subject-digest: ${{ steps.docker_build_sidecar.outputs.digest }}
141141
push-to-registry: true
142142
- name: Attest the Valkey image
143143
uses: actions/attest-build-provenance@v2
144144
id: attest_valkey
145145
with:
146-
subject-name: ${{ env.REGISTRY }}/halter/valkey
146+
subject-name: ${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey
147147
subject-digest: ${{ steps.docker_build_valkey.outputs.digest }}
148148
push-to-registry: true
149149
- name: Export digest
@@ -207,32 +207,32 @@ jobs:
207207
id: meta_sidecar
208208
uses: docker/metadata-action@v5
209209
with:
210-
images: ${{ env.REGISTRY }}/halter/valkey-sidecar
210+
images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey-sidecar
211211
tags: ${{ env.RELEASE_VERSION }}
212212
- name: Create manifest list and push
213213
working-directory: ${{ runner.temp }}/digests
214214
run: |
215215
cd sidecar
216216
docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
217-
$(printf '${{ env.REGISTRY }}/halter/valkey-sidecar@sha256:%s ' *)
217+
$(printf '${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey-sidecar@sha256:%s ' *)
218218
- name: Docker meta
219219
id: meta_valkey
220220
uses: docker/metadata-action@v5
221221
with:
222-
images: ${{ env.REGISTRY }}/halter/valkey
222+
images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey
223223
tags: ${{ env.VALKEY_VERSION }}
224224
- name: Create manifest list and push
225225
working-directory: ${{ runner.temp }}/digests
226226
run: |
227227
cd valkey
228228
docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
229-
$(printf '${{ env.REGISTRY }}/halter/valkey@sha256:%s ' *)
229+
$(printf '${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey@sha256:%s ' *)
230230
231231
- name: Inspect image
232232
run: |
233233
docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.meta_controller.outputs.version }}
234-
docker buildx imagetools inspect ${{ env.REGISTRY }}/halter/valkey-sidecar:${{ steps.meta_sidecar.outputs.version }}
235-
docker buildx imagetools inspect ${{ env.REGISTRY }}/halter/valkey:${{ steps.meta_valkey.outputs.version }}
234+
docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey-sidecar:${{ steps.meta_sidecar.outputs.version }}
235+
docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey:${{ steps.meta_valkey.outputs.version }}
236236
237237
- name: Run Trivy vulnerability scanner
238238
uses: aquasecurity/trivy-action@master

.github/workflows/publish.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
go-version: 1.23
4343
check-latest: true
4444
- name: Build Installer
45-
run: make build-installer IMG=ghcr.io/halter/valkey-operator:${{ github.ref_name }}
45+
run: make build-installer IMG=ghcr.io/${{ github.repository_owner }}/valkey-operator:${{ github.ref_name }}
4646
- name: Attest
4747
uses: actions/attest-build-provenance@v2
4848
id: attest
@@ -80,4 +80,4 @@ jobs:
8080
username: ${{ github.actor }}
8181
password: ${{ secrets.GITHUB_TOKEN }}
8282
- name: Package and Upload Helm Chart
83-
run: make helm-publish V=1 IMG=ghcr.io/halter/valkey-operator:${{ github.ref_name }}
83+
run: make helm-publish V=1 IMG=ghcr.io/${{ github.repository_owner }}/valkey-operator:${{ github.ref_name }}

.github/workflows/scan.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ jobs:
8989
file: Dockerfile.valkey
9090
context: .
9191
push: false
92-
tags: ${{ env.REGISTRY }}/halter/valkey:${{ github.SHA }}
92+
tags: ${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey:${{ github.SHA }}
9393
- name: Run Trivy vulnerability scanner
9494
uses: aquasecurity/trivy-action@master
9595
with:
96-
image-ref: ${{ env.REGISTRY }}/halter/valkey:${{ github.SHA }}
96+
image-ref: ${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey:${{ github.SHA }}
9797
format: 'sarif'
9898
output: 'trivy-results.sarif'
9999
- name: Upload Trivy scan results to GitHub Security tab

0 commit comments

Comments
 (0)