diff --git a/images/builder/docker/custom-docker-builder/Dockerfile b/images/builder/docker/custom-docker-builder/Dockerfile index 3ab16c311f8f..47d342c199fe 100644 --- a/images/builder/docker/custom-docker-builder/Dockerfile +++ b/images/builder/docker/custom-docker-builder/Dockerfile @@ -1,5 +1,6 @@ -# -# This is the image that executes a Docker build inside Origin. It expects a set of +# This image is intended for testing purposes, it has the same behavior as +# the origin-docker-builder image, but does so as a custom image so it can +# be used with Custom build strategies. It expects a set of # environment variables to parameterize the build: # # OUTPUT_REGISTRY - the Docker registry URL to push this image to @@ -8,15 +9,14 @@ # SOURCE_REF - a reference to pass to Git for which commit to use (optional) # # This image expects to have the Docker socket bind-mounted into the container. -# If "/root/.dockercfg" is bind mounted in, it will use that as authorization to a -# Docker registry. +# If "/root/.dockercfg" is bind mounted in, it will use that as authorization +# to a Docker registry. # # The standard name for this image is openshift/origin-custom-docker-builder # -FROM centos:centos7 - -RUN yum install -y --enablerepo=centosplus epel-release gettext tar automake make git docker +FROM openshift/origin-base +RUN yum install -y --enablerepo=centosplus gettext automake make docker ENV HOME /root ADD ./build.sh /tmp/build.sh CMD ["/tmp/build.sh"]