Merge pull request #2055 from jcantrill/fix_registry

Update container registry to registry.ci.openshift.org

Author: openshift-merge-robot

elasticsearch/Dockerfile.rhel8

@@ -1,4 +1,4 @@
-FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.7
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.7
 
 MAINTAINER OpenShift Development <[email protected]>
 

fluentd/Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.svc.ci.openshift.org/ocp/builder:ubi8.ruby.25 AS builder
+FROM registry.ci.openshift.org/ocp/builder:ubi8.ruby.25 AS builder
 
 MAINTAINER OpenShift Development <[email protected]>
 

hack/build-images.sh

@@ -25,19 +25,19 @@ function image_is_ubi() {
   if [ -f $1 ] ; then
     # if $1 is a file, assume a Dockerfile with a FROM - otherwise,
     # it is an image name
-    grep -q "^FROM registry.svc.ci.openshift.org/ocp/[1-9].[0-9][0-9]*" $1
+    grep -q "^FROM registry.ci.openshift.org/ocp/[1-9].[0-9][0-9]*" $1
   else
-    echo "$1" | grep -q "registry.svc.ci.openshift.org/ocp/[1-9].[0-9][0-9]*"
+    echo "$1" | grep -q "registry.ci.openshift.org/ocp/[1-9].[0-9][0-9]*"
   fi
 }
 
 function image_needs_private_repo() {
   # dockerfile is arg $1
   image_is_ubi $1 || \
-    grep -q "^FROM registry.svc.ci.openshift.org/openshift/origin-v4.[0-9][0-9]*:base" $1
+    grep -q "^FROM registry.ci.openshift.org/openshift/origin-v4.[0-9][0-9]*:base" $1
 }
 
-CI_REGISTRY=${CI_REGISTRY:-registry.svc.ci.openshift.org}
+CI_REGISTRY=${CI_REGISTRY:-registry.ci.openshift.org}
 CI_CLUSTER_NAME=${CI_CLUSTER_NAME:-api-ci-openshift-org:443}
 CUSTOM_IMAGE_TAG=${CUSTOM_IMAGE_TAG:-latest}
 

hack/deploy-logging.sh

@@ -173,7 +173,7 @@ get_cluster_version_maj_min
 # what numeric version does master correspond to?
 MASTER_VERSION=${MASTER_VERSION:-${CLUSTER_MAJ_MIN:-4.6}}
 # what namespace to use for operator images?
-EXTERNAL_REGISTRY=${EXTERNAL_REGISTRY:-registry.svc.ci.openshift.org}
+EXTERNAL_REGISTRY=${EXTERNAL_REGISTRY:-registry.ci.openshift.org}
 EXT_REG_IMAGE_NS=${EXT_REG_IMAGE_NS:-origin}
 # for dev purposes, image builds will typically be pushed to this namespace
 OPENSHIFT_BUILD_NAMESPACE=${OPENSHIFT_BUILD_NAMESPACE:-openshift}
@@ -190,7 +190,7 @@ construct_image_name() {
     local component="$1"
     local tagsuffix="${2:-latest}"
     # if running in CI environment, IMAGE_FORMAT will look like this:
-    # IMAGE_FORMAT=registry.svc.ci.openshift.org/ci-op-xxx/stable:${component}
+    # IMAGE_FORMAT=registry.ci.openshift.org/ci-op-xxx/stable:${component}
     # stable is the imagestream containing the images built for this PR, or
     # otherwise the most recent image
     if [ -n "${IMAGE_FORMAT:-}" ] ; then

kibana/Dockerfile.rhel8

@@ -1,4 +1,4 @@
-FROM registry.svc.ci.openshift.org/ocp/builder:ubi8.nodejs.10 AS build
+FROM registry.ci.openshift.org/ocp/builder:ubi8.nodejs.10 AS build
 
 MAINTAINER OpenShift Development <[email protected]>
 

test/eventrouter.sh

@@ -5,7 +5,7 @@
 source "$(dirname "${BASH_SOURCE[0]}" )/../hack/lib/init.sh"
 source "${OS_O_A_L_DIR}/hack/testing/util.sh"
 
-EXTERNAL_REGISTRY=${EXTERNAL_REGISTRY:-registry.svc.ci.openshift.org}
+EXTERNAL_REGISTRY=${EXTERNAL_REGISTRY:-registry.ci.openshift.org}
 EXT_REG_IMAGE_NS=${EXT_REG_IMAGE_NS:-origin}
 MASTER_VERSION=${MASTER_VERSION:-4.3}
 get_eventrouter_image() {

test/unit/Dockerfile.rhel8

@@ -1,4 +1,4 @@
-FROM registry.svc.ci.openshift.org/ocp/builder:ubi8.ruby.25
+FROM registry.ci.openshift.org/ocp/builder:ubi8.ruby.25
 MAINTAINER OpenShift Development <[email protected]>
 
 ENV FLUENTD_VERSION=1.0 \