Skip to content

Commit b8b2060

Browse files
authored
remove vcs_url (#2603)
Signed-off-by: Allen Li <[email protected]>
1 parent 3208a71 commit b8b2060

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
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 cmd/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="ibm common service operator" \
3231
org.label-schema.description="Deploy ODLM and IBM Common Services" \
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="common-service-operator" \

Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ CSV_PATH=bundle/manifests/ibm-common-service-operator.clusterserviceversion.yaml
3232
# environment variables before build the repo.
3333
BUILD_LOCALLY ?= 1
3434

35-
VCS_URL ?= https://github.com/IBM/ibm-common-service-operator
3635
VCS_REF ?= $(shell git rev-parse HEAD)
3736
VERSION ?= $(shell git describe --exact-match 2> /dev/null || \
3837
git describe --match=$(git rev-parse --short=8 HEAD) --always --dirty --abbrev=8)
@@ -188,7 +187,7 @@ deploy: manifests ## Deploy controller in the configured Kubernetes cluster in ~
188187
build-dev-image: cloudpak-theme.jar
189188
@echo "Building the $(OPERATOR_IMAGE_NAME) docker dev image for $(LOCAL_ARCH)..."
190189
@docker build -t $(REGISTRY)/$(OPERATOR_IMAGE_NAME)-$(LOCAL_ARCH):dev \
191-
--build-arg VCS_REF=$(VCS_REF) --build-arg VCS_URL=$(VCS_URL) --build-arg RELEASE_VERSION=$(RELEASE_VERSION) \
190+
--build-arg VCS_REF=$(VCS_REF) --build-arg RELEASE_VERSION=$(RELEASE_VERSION) \
192191
--build-arg GOARCH=$(LOCAL_ARCH) -f Dockerfile .
193192
@docker push $(REGISTRY)/$(OPERATOR_IMAGE_NAME)-$(LOCAL_ARCH):dev
194193

@@ -295,7 +294,7 @@ e2e-test: ## Run e2e test
295294
build-operator-image: $(CONFIG_DOCKER_TARGET) cloudpak-theme.jar ## Build the operator image.
296295
@echo "Building the $(OPERATOR_IMAGE_NAME) docker image for $(LOCAL_ARCH)..."
297296
@docker build -t $(OPERATOR_IMAGE_NAME)-$(LOCAL_ARCH):$(VERSION) \
298-
--build-arg VCS_REF=$(VCS_REF) --build-arg VCS_URL=$(VCS_URL) --build-arg RELEASE_VERSION=$(RELEASE_VERSION) \
297+
--build-arg VCS_REF=$(VCS_REF) --build-arg RELEASE_VERSION=$(RELEASE_VERSION) \
299298
--build-arg GOARCH=$(LOCAL_ARCH) -f Dockerfile .
300299

301300
##@ Release

0 commit comments

Comments
 (0)