diff --git a/Dockerfile b/Dockerfile index cb5386472..faa0ce366 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,14 +24,12 @@ RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -a -o manager cmd/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 ARG RELEASE_VERSION LABEL org.label-schema.vendor="IBM" \ org.label-schema.name="ibm common service operator" \ org.label-schema.description="Deploy ODLM and IBM Common Services" \ 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="common-service-operator" \ diff --git a/Makefile b/Makefile index d9c6e97fd..99a6591be 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,6 @@ CSV_PATH=bundle/manifests/ibm-common-service-operator.clusterserviceversion.yaml # environment variables before build the repo. BUILD_LOCALLY ?= 1 -VCS_URL ?= https://github.com/IBM/ibm-common-service-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) @@ -183,7 +182,7 @@ deploy: manifests ## Deploy controller in the configured Kubernetes cluster in ~ build-dev-image: cloudpak-theme.jar @echo "Building the $(OPERATOR_IMAGE_NAME) docker dev image for $(LOCAL_ARCH)..." @docker build -t $(REGISTRY)/$(OPERATOR_IMAGE_NAME)-$(LOCAL_ARCH):dev \ - --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 . @docker push $(REGISTRY)/$(OPERATOR_IMAGE_NAME)-$(LOCAL_ARCH):dev @@ -262,7 +261,7 @@ e2e-test: ## Run e2e test build-operator-image: $(CONFIG_DOCKER_TARGET) cloudpak-theme.jar ## 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