diff --git a/Dockerfile b/Dockerfile index ba88f1e..4d79ed4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,14 +24,12 @@ RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -a -o namespace-scope-opera 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 ARG RELEASE_VERSION LABEL org.label-schema.vendor="IBM" \ org.label-schema.name="IBM Namespace Scope Operator" \ org.label-schema.description="This operator automates the extension of operator watch and service account permission scope to other namespaces in an openshift cluster." \ 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="IBM Namespace Scope Operator" \ diff --git a/Makefile b/Makefile index 54c52d0..093ac13 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,6 @@ GOPATH=$(HOME)/go/bin/ # environment variables before build the repo. BUILD_LOCALLY ?= 1 -VCS_URL ?= https://github.com/IBM/ibm-namespace-scope-operator 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) @@ -216,7 +215,7 @@ e2e-test: ## Run e2e test 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 RELEASE_VERSION=$(RELEASE_VERSION) \ + --build-arg VCS_REF=$(VCS_REF) --build-arg RELEASE_VERSION=$(RELEASE_VERSION) \ --build-arg GOARCH=$(LOCAL_ARCH) -f Dockerfile . ##@ Release