diff --git a/images/dockerregistry/Dockerfile b/images/dockerregistry/Dockerfile index 827c10f09cfb..4058fc8e5ccb 100644 --- a/images/dockerregistry/Dockerfile +++ b/images/dockerregistry/Dockerfile @@ -4,23 +4,4 @@ # # The standard name for this image is openshift/origin-docker-registry # -FROM openshift/origin-base - -RUN INSTALL_PKGS="origin-dockerregistry" && \ - yum --enablerepo=origin-local-release install -y ${INSTALL_PKGS} && \ - rpm -V ${INSTALL_PKGS} && \ - yum clean all - -COPY config.yml ${REGISTRY_CONFIGURATION_PATH} - -LABEL io.k8s.display-name="OpenShift Container Platform Image Registry" \ - io.k8s.description="This is a component of OpenShift Container Platform and exposes a Docker registry that is integrated with the cluster for authentication and management." \ - io.openshift.tags="openshift,docker,registry" - -# The registry doesn't require a root user. -USER 1001 -EXPOSE 5000 -VOLUME /registry -ENV REGISTRY_CONFIGURATION_PATH=/config.yml - -CMD /usr/bin/dockerregistry ${REGISTRY_CONFIGURATION_PATH} +FROM openshift/origin-docker-registry:latest diff --git a/images/dockerregistry/Dockerfile.centos7 b/images/dockerregistry/Dockerfile.centos7 index 827c10f09cfb..4058fc8e5ccb 100644 --- a/images/dockerregistry/Dockerfile.centos7 +++ b/images/dockerregistry/Dockerfile.centos7 @@ -4,23 +4,4 @@ # # The standard name for this image is openshift/origin-docker-registry # -FROM openshift/origin-base - -RUN INSTALL_PKGS="origin-dockerregistry" && \ - yum --enablerepo=origin-local-release install -y ${INSTALL_PKGS} && \ - rpm -V ${INSTALL_PKGS} && \ - yum clean all - -COPY config.yml ${REGISTRY_CONFIGURATION_PATH} - -LABEL io.k8s.display-name="OpenShift Container Platform Image Registry" \ - io.k8s.description="This is a component of OpenShift Container Platform and exposes a Docker registry that is integrated with the cluster for authentication and management." \ - io.openshift.tags="openshift,docker,registry" - -# The registry doesn't require a root user. -USER 1001 -EXPOSE 5000 -VOLUME /registry -ENV REGISTRY_CONFIGURATION_PATH=/config.yml - -CMD /usr/bin/dockerregistry ${REGISTRY_CONFIGURATION_PATH} +FROM openshift/origin-docker-registry:latest