From fd90082f22615a0da5aeae423b7872c46d54a21b Mon Sep 17 00:00:00 2001 From: Allen Li Date: Fri, 15 Aug 2025 11:50:44 -0400 Subject: [PATCH] remove vcs_url Signed-off-by: Allen Li --- Dockerfile | 2 -- Makefile | 10 +++------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3ac68046..14567120 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,13 +24,11 @@ RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -a -o manager main.go FROM docker-na-public.artifactory.swg-devops.com/hyc-cloud-private-edge-docker-local/build-images/ubi9-minimal:latest ARG VCS_REF -ARG VCS_URL LABEL org.label-schema.vendor="IBM" \ org.label-schema.name="odlm" \ org.label-schema.description="Manager the lifecycle of the operands" \ org.label-schema.vcs-ref=$VCS_REF \ - org.label-schema.vcs-url=$VCS_URL \ org.label-schema.license="Licensed Materials - Property of IBM" \ org.label-schema.schema-version="1.0" \ name="odlm" \ diff --git a/Makefile b/Makefile index d4b575fe..5ad33b9d 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,6 @@ ENVCRDS_DIR=$(shell pwd)/testcrds # environment variables before build the repo. BUILD_LOCALLY ?= 1 -VCS_URL ?= https://github.com/IBM/operand-deployment-lifecycle-manager VCS_REF ?= $(shell git rev-parse HEAD) VERSION ?= $(shell git describe --exact-match 2> /dev/null || \ git describe --match=$(git rev-parse --short=8 HEAD) --always --dirty --abbrev=8) @@ -258,20 +257,17 @@ kind-load-img: build-operator-image: $(CONFIG_DOCKER_TARGET) ## Build the operator image. @echo "Building the $(OPERATOR_IMAGE_NAME) docker image for $(LOCAL_ARCH)..." @docker build -t $(OPERATOR_IMAGE_NAME)-$(LOCAL_ARCH):$(VERSION) \ - --build-arg VCS_REF=$(VCS_REF) --build-arg VCS_URL=$(VCS_URL) \ - --build-arg GOARCH=$(LOCAL_ARCH) -f Dockerfile . + --build-arg VCS_REF=$(VCS_REF) --build-arg GOARCH=$(LOCAL_ARCH) -f Dockerfile . build-operator-dev-image: ## Build the operator dev image. @echo "Building the $(DEV_REGISTRY)/$(OPERATOR_IMAGE_NAME) docker image..." @docker build -t $(DEV_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(VERSION) \ - --build-arg VCS_REF=$(VCS_REF) --build-arg VCS_URL=$(VCS_URL) \ - --build-arg GOARCH=$(LOCAL_ARCH) -f Dockerfile . + --build-arg VCS_REF=$(VCS_REF) --build-arg GOARCH=$(LOCAL_ARCH) -f Dockerfile . build-test-operator-image: $(CONFIG_DOCKER_TARGET) ## Build the operator test image. @echo "Building the $(OPERATOR_IMAGE_NAME) docker image for testing..." @docker build -t $(QUAY_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(OPERATOR_TEST_TAG) \ - --build-arg VCS_REF=$(VCS_REF) --build-arg VCS_URL=$(VCS_URL) \ - --build-arg GOARCH=$(LOCAL_ARCH) -f Dockerfile . + --build-arg VCS_REF=$(VCS_REF) --build-arg GOARCH=$(LOCAL_ARCH) -f Dockerfile . ##@ Release