Skip to content

Commit d862789

Browse files
authored
remove vcs_url (#1182)
Signed-off-by: Allen Li <[email protected]>
1 parent 4061a43 commit d862789

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,12 @@ RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -a -o manager main.go
2424
FROM docker-na-public.artifactory.swg-devops.com/hyc-cloud-private-edge-docker-local/build-images/ubi9-minimal:latest
2525

2626
ARG VCS_REF
27-
ARG VCS_URL
2827
ARG RELEASE_VERSION
2928

3029
LABEL org.label-schema.vendor="IBM" \
3130
org.label-schema.name="odlm" \
3231
org.label-schema.description="Manager the lifecycle of the operands" \
3332
org.label-schema.vcs-ref=$VCS_REF \
34-
org.label-schema.vcs-url=$VCS_URL \
3533
org.label-schema.license="Licensed Materials - Property of IBM" \
3634
org.label-schema.schema-version="1.0" \
3735
name="odlm" \

Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ ENVCRDS_DIR=$(shell pwd)/testcrds
2828
# environment variables before build the repo.
2929
BUILD_LOCALLY ?= 1
3030

31-
VCS_URL ?= https://github.com/IBM/operand-deployment-lifecycle-manager
3231
VCS_REF ?= $(shell git rev-parse HEAD)
3332
VERSION ?= $(shell git describe --exact-match 2> /dev/null || \
3433
git describe --match=$(git rev-parse --short=8 HEAD) --always --dirty --abbrev=8)
@@ -265,19 +264,19 @@ kind-load-img:
265264
build-operator-image: $(CONFIG_DOCKER_TARGET) ## Build the operator image.
266265
@echo "Building the $(OPERATOR_IMAGE_NAME) docker image for $(LOCAL_ARCH)..."
267266
@docker build -t $(OPERATOR_IMAGE_NAME)-$(LOCAL_ARCH):$(VERSION) \
268-
--build-arg VCS_REF=$(VCS_REF) --build-arg VCS_URL=$(VCS_URL) --build-arg RELEASE_VERSION=$(RELEASE_VERSION) \
267+
--build-arg VCS_REF=$(VCS_REF) --build-arg RELEASE_VERSION=$(RELEASE_VERSION) \
269268
--build-arg GOARCH=$(LOCAL_ARCH) -f Dockerfile .
270269

271270
build-operator-dev-image: ## Build the operator dev image.
272271
@echo "Building the $(DEV_REGISTRY)/$(OPERATOR_IMAGE_NAME) docker image..."
273272
@docker build -t $(DEV_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(VERSION) \
274-
--build-arg VCS_REF=$(VCS_REF) --build-arg VCS_URL=$(VCS_URL) --build-arg RELEASE_VERSION=$(RELEASE_VERSION) \
273+
--build-arg VCS_REF=$(VCS_REF) --build-arg RELEASE_VERSION=$(RELEASE_VERSION) \
275274
--build-arg GOARCH=$(LOCAL_ARCH) -f Dockerfile .
276275

277276
build-test-operator-image: $(CONFIG_DOCKER_TARGET) ## Build the operator test image.
278277
@echo "Building the $(OPERATOR_IMAGE_NAME) docker image for testing..."
279278
@docker build -t $(DEV_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(OPERATOR_TEST_TAG) \
280-
--build-arg VCS_REF=$(VCS_REF) --build-arg VCS_URL=$(VCS_URL) --build-arg RELEASE_VERSION=$(RELEASE_VERSION) \
279+
--build-arg VCS_REF=$(VCS_REF) --build-arg RELEASE_VERSION=$(RELEASE_VERSION) \
281280
--build-arg GOARCH=$(LOCAL_ARCH) -f Dockerfile .
282281

283282
build-push-test-image: build-test-operator-image ## Build and push the operator test image.

0 commit comments

Comments
 (0)