Skip to content

Commit df6e523

Browse files
Move docker image publishing into release pipeline (#1602)
* remove push * version
1 parent a43f2d8 commit df6e523

File tree

3 files changed

+3
-15
lines changed

3 files changed

+3
-15
lines changed

.pipelines/nightly-build.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,9 @@ steps:
3333
echo '##vso[task.prependpath]$(GOROOT)/bin'
3434
displayName: "Set up the Go workspace"
3535
36-
- task: Docker@2
37-
displayName: Login to ACR
38-
inputs:
39-
command: login
40-
containerRegistry: "AGIC Registry"
41-
4236
- script: |
4337
docker buildx create --use
44-
make build-image-multi-arch BUILD_TAG=$(build.buildid) PUSH_IMAGE=true
38+
make build-image-multi-arch BUILD_TAG=$(build.buildid)
4539
workingDirectory: "$(modulePath)"
4640
displayName: "Build nightly image"
4741

.pipelines/release-build.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,9 @@ steps:
2828
echo '##vso[task.prependpath]$(GOROOT)/bin'
2929
displayName: "Set up the Go workspace"
3030
31-
- task: Docker@2
32-
displayName: Login to ACR
33-
inputs:
34-
command: login
35-
containerRegistry: "AGIC Registry"
36-
3731
- script: |
3832
docker buildx create --use
39-
make build-image-multi-arch RELEASE_IMAGE=true PUSH_IMAGE=true
33+
make build-image-multi-arch RELEASE_IMAGE=true
4034
workingDirectory: "$(modulePath)"
4135
displayName: "Build release image"
4236

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ REPO ?= appgwreg.azurecr.io
2121
IMAGE_NAME = public/azure-application-gateway/kubernetes-ingress-staging
2222
IMAGE = ${REPO}/${IMAGE_NAME}
2323

24-
IMAGE_RESULT_FLAG = --output=type=oci,dest=$(shell pwd)/image/ingress-agic-$(VERSION).tar
24+
IMAGE_RESULT_FLAG = --output=type=oci,dest=$(shell pwd)/image/ingress-agic-$(BUILD_TAG).tar
2525
ifeq ($(PUSH_IMAGE), true)
2626
IMAGE_RESULT_FLAG = --push
2727
endif

0 commit comments

Comments
 (0)