Skip to content

Commit dd5fe79

Browse files
committed
Makefile: switch image/scaffold/* to image-scaffold-*
1 parent f72bb65 commit dd5fe79

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,14 +156,14 @@ test-e2e-helm: image-build-helm
156156
./hack/tests/e2e-helm.sh
157157

158158
# Image scaffold/build/push.
159-
.PHONY: image image/scaffold/ansible image/scaffold/helm image-build image-build-ansible image-build-helm image/push image/push/ansible image/push/helm
159+
.PHONY: image image-scaffold-ansible image-scaffold-helm image-build image-build-ansible image-build-helm image/push image/push/ansible image/push/helm
160160

161161
image: image-build image/push ## Build and push all images
162162

163-
image/scaffold/ansible:
163+
image-scaffold-ansible:
164164
go run ./hack/image/ansible/scaffold-ansible-image.go
165165

166-
image/scaffold/helm:
166+
image-scaffold-helm:
167167
go run ./hack/image/helm/scaffold-helm-image.go
168168

169169
image-build: image-build-ansible image-build-helm image-build-scorecard-proxy ## Build all images

ci/dockerfiles/ansible-e2e-hybrid.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM osdk-builder as builder
22

3-
RUN make image/scaffold/ansible
3+
RUN make image-scaffold-ansible
44
RUN ci/tests/scaffolding/e2e-ansible-scaffold-hybrid.sh
55

66
FROM registry.access.redhat.com/ubi8/ubi

ci/dockerfiles/ansible.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM osdk-builder as builder
22

3-
RUN make image/scaffold/ansible
3+
RUN make image-scaffold-ansible
44

55
FROM registry.access.redhat.com/ubi8/ubi
66

ci/dockerfiles/helm-e2e-hybrid.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM osdk-builder as builder
22

3-
RUN make image/scaffold/helm
3+
RUN make image-scaffold-helm
44
RUN ci/tests/scaffolding/e2e-helm-scaffold-hybrid.sh
55

66
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest

ci/dockerfiles/helm.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM osdk-builder as builder
22

3-
RUN make image/scaffold/helm
3+
RUN make image-scaffold-helm
44

55
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
66

0 commit comments

Comments
 (0)