Skip to content

Commit 280f338

Browse files
committed
Makefile: switch image/push/* to image-push-*
1 parent dd5fe79 commit 280f338

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,33 +161,33 @@ jobs:
161161
name: Docker image for ansible-operator
162162
script:
163163
- make image-build-ansible
164-
- make image/push/ansible
164+
- 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:
171171
- make image-build-helm
172-
- make image/push/helm
172+
- 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:
179179
- make image-build-helm
180-
- make image/push/helm
180+
- make image-push-helm
181181

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

189189
# Build and deploy helm multi-arch manifest list
190190
- <<: *manifest-deploy
191191
name: Manifest list for helm-operator
192192
script:
193-
- make image/push/helm-multiarch
193+
- make image-push-helm-multiarch

Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,9 @@ 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
@@ -177,16 +177,16 @@ image-build-helm: build/operator-sdk-dev
177177
image-build-scorecard-proxy:
178178
./hack/image/build-scorecard-proxy-image.sh $(SCORECARD_PROXY_BASE_IMAGE):dev
179179

180-
image/push: image/push/ansible image/push/helm image/push/scorecard-proxy ## Push all images
180+
image-push: image-push-ansible image-push-helm image-push-scorecard-proxy ## Push all images
181181

182-
image/push/ansible:
182+
image-push-ansible:
183183
./hack/image/push-image-tags.sh $(ANSIBLE_BASE_IMAGE):dev $(ANSIBLE_IMAGE)
184184

185-
image/push/helm:
185+
image-push-helm:
186186
./hack/image/push-image-tags.sh $(HELM_BASE_IMAGE):dev $(HELM_IMAGE)-$(shell go env GOARCH)
187187

188-
image/push/helm-multiarch:
188+
image-push-helm-multiarch:
189189
./hack/image/push-manifest-list.sh $(HELM_IMAGE) ${HELM_ARCHES}
190190

191-
image/push/scorecard-proxy:
191+
image-push-scorecard-proxy:
192192
./hack/image/push-image-tags.sh $(SCORECARD_PROXY_BASE_IMAGE):dev $(SCORECARD_PROXY_IMAGE)

0 commit comments

Comments
 (0)