diff --git a/Makefile b/Makefile index c83607d9..25ed9673 100644 --- a/Makefile +++ b/Makefile @@ -109,7 +109,6 @@ endif ifeq ($(BUILD_LOCALLY),0) export CONFIG_DOCKER_TARGET = config-docker - export CONFIG_DOCKER_TARGET_QUAY = config-docker-quay endif include common/Makefile.common.mk diff --git a/common/Makefile.common.mk b/common/Makefile.common.mk index 50fe01ed..b7c20102 100644 --- a/common/Makefile.common.mk +++ b/common/Makefile.common.mk @@ -39,9 +39,6 @@ endif config-docker: get-cluster-credentials @common/scripts/artifactory_config_docker.sh -config-docker-quay: get-cluster-credentials - @common/scripts/quay_config_docker.sh - # find or download operator-sdk # download operator-sdk if necessary operator-sdk: diff --git a/common/scripts/quay_config_docker.sh b/common/scripts/quay_config_docker.sh deleted file mode 100755 index bea1ee9a..00000000 --- a/common/scripts/quay_config_docker.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -# -# Copyright 2022 IBM Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -KUBECTL=$(command -v kubectl) -DOCKER_REGISTRY="quay.io" -DOCKER_USERNAME="multicloudlab" -DOCKER_PASSWORD=$(${KUBECTL} -n default get secret quay-cred -o jsonpath='{.data.password}' | base64 --decode) - -# support other container tools, e.g. podman -CONTAINER_CLI=${CONTAINER_CLI:-docker} - -# login the docker registry -${CONTAINER_CLI} login "${DOCKER_REGISTRY}" -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}" -