From 82ac5c456fe404ab50c37f487cb7503b9cb9b45e Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Wed, 1 Jul 2020 11:27:04 +0200 Subject: [PATCH] Update base image in Dockerfile This would enable us to simplify CI config and import less images --- Dockerfile | 2 +- Dockerfile.rhel7 | 2 +- Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5feafc288..a83833692 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ COPY . . # just use that. For now we work around this by copying a tarball. RUN make install DESTDIR=./instroot && tar -C instroot -cf instroot.tar . -FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base +FROM registry.svc.ci.openshift.org/origin/4.5:base COPY --from=builder /go/src/github.com/openshift/machine-config-operator/instroot.tar /tmp/instroot.tar RUN cd / && tar xf /tmp/instroot.tar && rm -f /tmp/instroot.tar COPY install /manifests diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7 index f5181ee3d..c5a841748 100644 --- a/Dockerfile.rhel7 +++ b/Dockerfile.rhel7 @@ -6,7 +6,7 @@ COPY . . # just use that. For now we work around this by copying a tarball. RUN make install DESTDIR=./instroot && tar -C instroot -cf instroot.tar . -FROM registry.svc.ci.openshift.org/ocp/4.0:base +FROM registry.svc.ci.openshift.org/ocp/4.5:base COPY --from=builder /go/src/github.com/openshift/machine-config-operator/instroot.tar /tmp/instroot.tar RUN cd / && tar xf /tmp/instroot.tar && rm -f /tmp/instroot.tar COPY install /manifests diff --git a/Makefile b/Makefile index 0ede0f718..dd07afd45 100644 --- a/Makefile +++ b/Makefile @@ -105,7 +105,7 @@ install: binaries Dockerfile.rhel7: Dockerfile Makefile (echo '# THIS FILE IS GENERATED FROM '$<' DO NOT EDIT' && \ - sed -e s,org/openshift/release,org/ocp/builder, -e s,/openshift/origin-v4.0:base,/ocp/4.0:base, < $<) > $@.tmp && mv $@.tmp $@ + sed -e s,org/openshift/release,org/ocp/builder, -e s,/origin/4.5:base,/ocp/4.5:base, < $<) > $@.tmp && mv $@.tmp $@ # This was copied from https://github.com/openshift/cluster-image-registry-operator test-e2e: