Skip to content

Commit 92ebcb7

Browse files
Merge pull request #2055 from jcantrill/fix_registry
Update container registry to registry.ci.openshift.org
2 parents 30df61f + fe73e5f commit 92ebcb7

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

elasticsearch/Dockerfile.rhel8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.7
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.7
22

33
MAINTAINER OpenShift Development <[email protected]>
44

fluentd/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.svc.ci.openshift.org/ocp/builder:ubi8.ruby.25 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:ubi8.ruby.25 AS builder
22

33
MAINTAINER OpenShift Development <[email protected]>
44

hack/build-images.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@ function image_is_ubi() {
2525
if [ -f $1 ] ; then
2626
# if $1 is a file, assume a Dockerfile with a FROM - otherwise,
2727
# it is an image name
28-
grep -q "^FROM registry.svc.ci.openshift.org/ocp/[1-9].[0-9][0-9]*" $1
28+
grep -q "^FROM registry.ci.openshift.org/ocp/[1-9].[0-9][0-9]*" $1
2929
else
30-
echo "$1" | grep -q "registry.svc.ci.openshift.org/ocp/[1-9].[0-9][0-9]*"
30+
echo "$1" | grep -q "registry.ci.openshift.org/ocp/[1-9].[0-9][0-9]*"
3131
fi
3232
}
3333

3434
function image_needs_private_repo() {
3535
# dockerfile is arg $1
3636
image_is_ubi $1 || \
37-
grep -q "^FROM registry.svc.ci.openshift.org/openshift/origin-v4.[0-9][0-9]*:base" $1
37+
grep -q "^FROM registry.ci.openshift.org/openshift/origin-v4.[0-9][0-9]*:base" $1
3838
}
3939

40-
CI_REGISTRY=${CI_REGISTRY:-registry.svc.ci.openshift.org}
40+
CI_REGISTRY=${CI_REGISTRY:-registry.ci.openshift.org}
4141
CI_CLUSTER_NAME=${CI_CLUSTER_NAME:-api-ci-openshift-org:443}
4242
CUSTOM_IMAGE_TAG=${CUSTOM_IMAGE_TAG:-latest}
4343

hack/deploy-logging.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ get_cluster_version_maj_min
173173
# what numeric version does master correspond to?
174174
MASTER_VERSION=${MASTER_VERSION:-${CLUSTER_MAJ_MIN:-4.6}}
175175
# what namespace to use for operator images?
176-
EXTERNAL_REGISTRY=${EXTERNAL_REGISTRY:-registry.svc.ci.openshift.org}
176+
EXTERNAL_REGISTRY=${EXTERNAL_REGISTRY:-registry.ci.openshift.org}
177177
EXT_REG_IMAGE_NS=${EXT_REG_IMAGE_NS:-origin}
178178
# for dev purposes, image builds will typically be pushed to this namespace
179179
OPENSHIFT_BUILD_NAMESPACE=${OPENSHIFT_BUILD_NAMESPACE:-openshift}
@@ -190,7 +190,7 @@ construct_image_name() {
190190
local component="$1"
191191
local tagsuffix="${2:-latest}"
192192
# if running in CI environment, IMAGE_FORMAT will look like this:
193-
# IMAGE_FORMAT=registry.svc.ci.openshift.org/ci-op-xxx/stable:${component}
193+
# IMAGE_FORMAT=registry.ci.openshift.org/ci-op-xxx/stable:${component}
194194
# stable is the imagestream containing the images built for this PR, or
195195
# otherwise the most recent image
196196
if [ -n "${IMAGE_FORMAT:-}" ] ; then

kibana/Dockerfile.rhel8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.svc.ci.openshift.org/ocp/builder:ubi8.nodejs.10 AS build
1+
FROM registry.ci.openshift.org/ocp/builder:ubi8.nodejs.10 AS build
22

33
MAINTAINER OpenShift Development <[email protected]>
44

test/eventrouter.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
source "$(dirname "${BASH_SOURCE[0]}" )/../hack/lib/init.sh"
66
source "${OS_O_A_L_DIR}/hack/testing/util.sh"
77

8-
EXTERNAL_REGISTRY=${EXTERNAL_REGISTRY:-registry.svc.ci.openshift.org}
8+
EXTERNAL_REGISTRY=${EXTERNAL_REGISTRY:-registry.ci.openshift.org}
99
EXT_REG_IMAGE_NS=${EXT_REG_IMAGE_NS:-origin}
1010
MASTER_VERSION=${MASTER_VERSION:-4.3}
1111
get_eventrouter_image() {

test/unit/Dockerfile.rhel8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.svc.ci.openshift.org/ocp/builder:ubi8.ruby.25
1+
FROM registry.ci.openshift.org/ocp/builder:ubi8.ruby.25
22
MAINTAINER OpenShift Development <[email protected]>
33

44
ENV FLUENTD_VERSION=1.0 \

0 commit comments

Comments
 (0)