Skip to content

Commit d4ae728

Browse files
committed
Update docker images to use commit SHA instead of PR number
1 parent d2b9083 commit d4ae728

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

.github/workflows/reusable-docker-build.yml

+2
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ jobs:
6464
type=ref,event=pr
6565
type=match,pattern=refs/tags/${{ inputs.binary-name }}-v(.*),group=1,enable=${{ startsWith(env.FULL_REF, 'refs/tags/') }},value=${{ env.FULL_REF }}
6666
type=sha
67+
# set the actual commit SHA to the PR
68+
type=raw,value=sha-${{ github.event.pull_request.head.sha || github.sha }}
6769
# set latest tag for `main` branch
6870
type=raw,value=latest,enable=${{ env.FULL_REF == format('refs/heads/{0}', 'main') }}
6971
- name: Build and push

dev/argocd/pr-preview-envs/evm-appset.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: argoproj.io/v1alpha1
33
kind: ApplicationSet
44
metadata:
5-
name: pr-preview-rollup
5+
name: demo-preview-rollup
66
namespace: argocd
77
spec:
88
# Ref: https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/GoTemplate/
@@ -30,6 +30,7 @@ spec:
3030
secretName: github-pat
3131
labels:
3232
# All of the following labels are required to be set on the PR for the app to be created
33+
- infra
3334
- preview
3435
- evm
3536
- docker-build
@@ -108,10 +109,10 @@ spec:
108109
token: http://celestia-service.pr-{{.number}}.svc.cluster.local:5353
109110
images:
110111
composer:
111-
devTag: pr-{{.number}}
112+
devTag: sha-{{.head_short_sha_7}}
112113
pullPolicy: Always
113114
conductor:
114-
devTag: pr-{{.number}}
115+
devTag: sha-{{.head_short_sha_7}}
115116
pullPolicy: Always
116117
ingress:
117118
enabled: true

dev/argocd/pr-preview-envs/sequencer-appset.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: argoproj.io/v1alpha1
33
kind: ApplicationSet
44
metadata:
5-
name: pr-preview-sequencer-0
5+
name: demo-preview-sequencer
66
namespace: argocd
77
spec:
88
# Ref: https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/GoTemplate/
@@ -30,8 +30,9 @@ spec:
3030
secretName: github-pat
3131
labels:
3232
# ALL of the following labels are required to be set on the PR for the app to be created
33+
- infra
3334
- preview
34-
- evm
35+
- sequencer
3536
- docker-build
3637
requeueAfterSeconds: 60
3738
template:
@@ -84,7 +85,7 @@ spec:
8485

8586
images:
8687
sequencer:
87-
devTag: pr-{{.number}}
88+
devTag: sha-{{.head_short_sha_7}}
8889
pullPolicy: Always
8990
ingress:
9091
grpc:

0 commit comments

Comments
 (0)