Skip to content

Commit ce27b47

Browse files
authored
remove vcs_url (#1183)
Signed-off-by: Allen Li <[email protected]>
1 parent 2e1ac0f commit ce27b47

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,11 @@ 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

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

Makefile

Lines changed: 3 additions & 7 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)
@@ -258,20 +257,17 @@ kind-load-img:
258257
build-operator-image: $(CONFIG_DOCKER_TARGET) ## Build the operator image.
259258
@echo "Building the $(OPERATOR_IMAGE_NAME) docker image for $(LOCAL_ARCH)..."
260259
@docker build -t $(OPERATOR_IMAGE_NAME)-$(LOCAL_ARCH):$(VERSION) \
261-
--build-arg VCS_REF=$(VCS_REF) --build-arg VCS_URL=$(VCS_URL) \
262-
--build-arg GOARCH=$(LOCAL_ARCH) -f Dockerfile .
260+
--build-arg VCS_REF=$(VCS_REF) --build-arg GOARCH=$(LOCAL_ARCH) -f Dockerfile .
263261

264262
build-operator-dev-image: ## Build the operator dev image.
265263
@echo "Building the $(DEV_REGISTRY)/$(OPERATOR_IMAGE_NAME) docker image..."
266264
@docker build -t $(DEV_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(VERSION) \
267-
--build-arg VCS_REF=$(VCS_REF) --build-arg VCS_URL=$(VCS_URL) \
268-
--build-arg GOARCH=$(LOCAL_ARCH) -f Dockerfile .
265+
--build-arg VCS_REF=$(VCS_REF) --build-arg GOARCH=$(LOCAL_ARCH) -f Dockerfile .
269266

270267
build-test-operator-image: $(CONFIG_DOCKER_TARGET) ## Build the operator test image.
271268
@echo "Building the $(OPERATOR_IMAGE_NAME) docker image for testing..."
272269
@docker build -t $(QUAY_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(OPERATOR_TEST_TAG) \
273-
--build-arg VCS_REF=$(VCS_REF) --build-arg VCS_URL=$(VCS_URL) \
274-
--build-arg GOARCH=$(LOCAL_ARCH) -f Dockerfile .
270+
--build-arg VCS_REF=$(VCS_REF) --build-arg GOARCH=$(LOCAL_ARCH) -f Dockerfile .
275271

276272
##@ Release
277273

0 commit comments

Comments
 (0)