Skip to content

Commit f72bb65

Browse files
committed
Makefile: switch image/build/* to image-build-*
1 parent 7db0b18 commit f72bb65

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,30 +160,30 @@ jobs:
160160
- <<: *deploy
161161
name: Docker image for ansible-operator
162162
script:
163-
- make image/build/ansible
163+
- make image-build-ansible
164164
- make image/push/ansible
165165

166166
# Build and deploy amd64 helm-operator docker image
167167
- <<: *deploy
168168
name: Docker image for helm-operator (amd64)
169169
os: linux
170170
script:
171-
- make image/build/helm
171+
- make image-build-helm
172172
- make image/push/helm
173173

174174
# Build and deploy ppc64le helm-operator docker image
175175
- <<: *deploy
176176
name: Docker image for helm-operator (ppc64le)
177177
os: linux-ppc64le
178178
script:
179-
- make image/build/helm
179+
- make image-build-helm
180180
- make image/push/helm
181181

182182
# Build and deploy scorecard-proxy docker image
183183
- <<: *deploy
184184
name: Docker image for scorecard-proxy
185185
script:
186-
- make image/build/scorecard-proxy
186+
- make image-build-scorecard-proxy
187187
- make image/push/scorecard-proxy
188188

189189
# Build and deploy helm multi-arch manifest list

Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -146,35 +146,35 @@ test-e2e: test-e2e-go test-e2e-ansible test-e2e-ansible-molecule test-e2e-helm #
146146
test-e2e-go:
147147
./hack/tests/e2e-go.sh $(ARGS)
148148

149-
test-e2e-ansible: image/build/ansible
149+
test-e2e-ansible: image-build-ansible
150150
./hack/tests/e2e-ansible.sh
151151

152-
test-e2e-ansible-molecule: image/build/ansible
152+
test-e2e-ansible-molecule: image-build-ansible
153153
./hack/tests/e2e-ansible-molecule.sh
154154

155-
test-e2e-helm: image/build/helm
155+
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

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

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

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

169-
image/build: image/build/ansible image/build/helm image/build/scorecard-proxy ## Build all images
169+
image-build: image-build-ansible image-build-helm image-build-scorecard-proxy ## Build all images
170170

171-
image/build/ansible: build/operator-sdk-dev-x86_64-linux-gnu
171+
image-build-ansible: build/operator-sdk-dev-x86_64-linux-gnu
172172
./hack/image/build-ansible-image.sh $(ANSIBLE_BASE_IMAGE):dev
173173

174-
image/build/helm: build/operator-sdk-dev
174+
image-build-helm: build/operator-sdk-dev
175175
./hack/image/build-helm-image.sh $(HELM_BASE_IMAGE):dev
176176

177-
image/build/scorecard-proxy:
177+
image-build-scorecard-proxy:
178178
./hack/image/build-scorecard-proxy-image.sh $(SCORECARD_PROXY_BASE_IMAGE):dev
179179

180180
image/push: image/push/ansible image/push/helm image/push/scorecard-proxy ## Push all images

0 commit comments

Comments
 (0)