@@ -8,14 +8,13 @@

 #

 FROM openshift/origin-base

-RUN yum install -y golang && yum clean all

-

 WORKDIR /go/src/github.com/openshift/origin

-ADD .   /go/src/github.com/openshift/origin

-ENV GOPATH /go

-ENV PATH $PATH:$GOROOT/bin:$GOPATH/bin

+COPY . /go/src/github.com/openshift/origin

+ENV GOPATH=/go \

+    PATH=$PATH:$GOROOT/bin:$GOPATH/bin

-RUN go get github.com/openshift/origin && \

+RUN yum install -y golang && yum clean all && \

+    go get github.com/openshift/origin && \

     hack/build-go.sh && \

     cp _output/local/bin/linux/amd64/* /usr/bin/ && \

     mkdir -p /var/lib/origin

@@ -6,7 +6,7 @@

 FROM scratch

 MAINTAINER Clayton Coleman <ccoleman@redhat.com>

-ADD bin/deployment /deployment

+COPY bin/deployment /deployment

 EXPOSE 8080

 ENV COLOR="#006e9c"

@@ -6,7 +6,7 @@

 FROM scratch

 MAINTAINER Clayton Coleman <ccoleman@redhat.com>

-ADD bin/deployment /deployment

+COPY bin/deployment /deployment

 EXPOSE 8080

 ENV COLOR="#b5d4a8"

@@ -24,6 +24,6 @@ RUN mkdir -p /var/lib/etcd && chmod go+rwx /var/lib/etcd

 VOLUME ["/var/lib/etcd"]

-ADD etcd*.sh /usr/local/bin/

+COPY etcd*.sh /usr/local/bin/

 CMD ["/usr/local/bin/etcd.sh"]

@@ -5,14 +5,14 @@

 #

 FROM openshift/origin

-ADD bin/gitserver /usr/bin/gitserver

-ADD hooks/ /var/lib/git-hooks/

+COPY bin/gitserver /usr/bin/gitserver

+COPY hooks/ /var/lib/git-hooks/

+COPY gitconfig /var/lib/gitconfig/.gitconfig

 RUN mkdir -p /var/lib/git && \

     mkdir -p /var/lib/gitconfig && \

     chmod 777 /var/lib/gitconfig && \

     ln -s /usr/bin/gitserver /usr/bin/gitrepo-buildconfigs

-ADD gitconfig /var/lib/gitconfig/.gitconfig

-ENV HOME=/var/lib/gitconfig

 VOLUME /var/lib/git

+ENV HOME=/var/lib/gitconfig

 ENTRYPOINT ["/usr/bin/gitserver"]

@@ -1,5 +1,5 @@

 FROM scratch

 MAINTAINER Jessica Forrester <jforrest@redhat.com>

-ADD bin/hello-openshift /hello-openshift

+COPY bin/hello-openshift /hello-openshift

 EXPOSE 8080 8888

 ENTRYPOINT ["/hello-openshift"]

@@ -110,8 +110,6 @@ image openshift/origin-gitserver             examples/gitserver

 image openshift/origin-sti-builder           images/builder/docker/sti-builder

 image openshift/origin-f5-router             images/router/f5

 image openshift/node                         images/node

-# unpublished images

-image openshift/origin-custom-docker-builder images/builder/docker/custom-docker-builder

 # extra images (not part of infrastructure)

 image openshift/hello-openshift              examples/hello-openshift

@@ -1,19 +1,17 @@

 #

 # This is the base image from which all OpenShift Origin images inherit. Only packages

-# common to all downstream images should be here.

+# common to all downstream images should be here. Depends on Centos 7.2+

 #

 # The standard name for this image is openshift/origin-base

 #

 FROM centos:centos7

-# components from EPEL must be installed in a separate yum install step

-

-# TODO: systemd update from centos 7.1 -> 7.2 is broken, remove this once 7.2

-# base images land

-RUN yum swap -y -- remove systemd-container\* -- install systemd systemd-libs

-

 RUN INSTALL_PKGS="which git tar wget hostname sysvinit-tools util-linux bsdtar epel-release \

-        socat ethtool device-mapper iptables e2fsprogs xfsprogs" && \

+      socat ethtool device-mapper iptables tree findutils nc e2fsprogs xfsprogs" && \

     yum install -y $INSTALL_PKGS && \

     rpm -V $INSTALL_PKGS && \

-    yum clean all

+    yum clean all && \

+    mkdir -p /var/lib/origin

+

+LABEL io.k8s.display-name="OpenShift Origin Centos 7 Base" \

+      io.k8s.description="This is the base image from which all OpenShift Origin images inherit."

@@ -1,5 +1,5 @@

 #

-# This is the rhel7 base image from which all rhel7 based OpenShift Origin images

+# This is the rhel7 base image from which all rhel7 based Atomic OpenShift images

 # inherit. Only packages common to all downstream images should be here.

 #

 # The standard name for this image is openshift/ose-base

@@ -7,7 +7,11 @@

 FROM rhel7

 RUN INSTALL_PKGS="which git tar wget hostname sysvinit-tools util-linux bsdtar \

-    socat ethtool device-mapper iptables e2fsprogs xfsprogs" && \

+      socat ethtool device-mapper iptables tree findutils nc e2fsprogs xfsprogs" && \

     yum install -y $INSTALL_PKGS && \

     rpm -V $INSTALL_PKGS && \

-    yum clean all

+    yum clean all && \

+    mkdir -p /var/lib/origin

+

+LABEL io.k8s.display-name="Atomic OpenShift RHEL 7 Base" \

+      io.k8s.description="This is the base image from which all Atomic OpenShift images inherit."

@@ -9,7 +9,7 @@

 #   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 

+# 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

@@ -20,6 +20,9 @@ RUN INSTALL_PKGS="gettext automake make docker" && \

     yum install -y --enablerepo=centosplus $INSTALL_PKGS && \

     rpm -V $INSTALL_PKGS && \

     yum clean all

-ENV HOME /root

-ADD ./build.sh /tmp/build.sh

+

+LABEL io.k8s.display-name="OpenShift Origin Custom Builder Example" \

+      io.k8s.description="This is an example of a custom builder for use with OpenShift Origin."

+ENV HOME=/root

+COPY build.sh /tmp/build.sh

 CMD ["/tmp/build.sh"]

@@ -12,5 +12,6 @@

 #

 FROM openshift/origin

-ENV HOME /root

+LABEL io.k8s.display-name="OpenShift Origin Docker Builder" \

+      io.k8s.description="This is a component of OpenShift Origin and is responsible for executing Docker image builds."

 ENTRYPOINT ["/usr/bin/openshift-docker-build"]

@@ -1,5 +1,5 @@

 #

-# This is the image that executes a STI build inside Origin. It expects the

+# This is the image that executes a S2I build inside Origin. It expects the

 # following environment variables:

 #

 #   BUILD - JSON string containing the openshift build object

@@ -12,5 +12,6 @@

 #

 FROM openshift/origin

-ENV HOME /root

+LABEL io.k8s.display-name="OpenShift Origin S2I Builder" \

+      io.k8s.description="This is a component of OpenShift Origin and is responsible for executing source-to-image (s2i) image builds."

 ENTRYPOINT ["/usr/bin/openshift-sti-build"]

@@ -2,14 +2,18 @@

 # This is the default deployment strategy image for OpenShift Origin. It expects a set of

 # environment variables to parameterize the deploy:

 #

-#   KUBERNETES_MASTER - the address of the OpenShift master

-#   KUBERNETES_DEPLOYMENT_ID - the deployment identifier that is running this build

+#   "OPENSHIFT_DEPLOYMENT_NAME" - the name of a replication controller that is being deployed

+#   "OPENSHIFT_DEPLOYMENT_NAMESPACE" - the namespace of the replication controller that is being deployed

+#

+# It also expects to receive the standard Kubernetes service account secret to connect back to

+# the OpenShift API to drive the deployment.

 #

 # The standard name for this image is openshift/origin-deployer

 #

 FROM openshift/origin

-# The deployer doesn't require a privileged user.

+LABEL io.k8s.display-name="OpenShift Origin Deployer" \

+      io.k8s.description="This is a component of OpenShift Origin and executes the user deployment process to roll out new containers. It may be used as a base image for building your own custom deployer image."

+# The deployer doesn't require a root user.

 USER 1001

-

 ENTRYPOINT ["/usr/bin/openshift-deploy"]

@@ -1,9 +1,9 @@

 #

-# This image is used for running a host of an openshift dev cluster.

+# This image is used for running a host of an openshift dev cluster. This image is

+# a development support image and should not be used in production environments.

 #

 # The standard name for this image is openshift/dind

 #

-

 FROM fedora:23

 ## Configure systemd to run in a container

@@ -6,18 +6,16 @@

 #

 FROM openshift/origin-base

-RUN INSTALL_PKGS="tree findutils epel-release" && \

-    yum install -y $INSTALL_PKGS && \

-    rpm -V $INSTALL_PKGS && \

-    yum clean all

+COPY config.yml $REGISTRY_CONFIGURATION_PATH

+COPY bin/dockerregistry /dockerregistry

-# The registry doesn't require a privileged user.

-USER 1001

+LABEL io.k8s.display-name="OpenShift Origin Image Registry" \

+      io.k8s.description="This is a component of OpenShift Origin and exposes a Docker registry that is integrated with the cluster for authentication and management."

+# The registry doesn't require a root user.

+USER 1001

 EXPOSE 5000

 VOLUME /registry

-ENV REGISTRY_CONFIGURATION_PATH /config.yml

-CMD DOCKER_REGISTRY_URL=${DOCKER_REGISTRY_SERVICE_HOST}:${DOCKER_REGISTRY_SERVICE_PORT} /dockerregistry ${REGISTRY_CONFIGURATION_PATH}

+ENV REGISTRY_CONFIGURATION_PATH=/config.yml

-ADD config.yml $REGISTRY_CONFIGURATION_PATH

-ADD bin/dockerregistry /dockerregistry

+CMD DOCKER_REGISTRY_URL=${DOCKER_REGISTRY_SERVICE_HOST}:${DOCKER_REGISTRY_SERVICE_PORT} /dockerregistry ${REGISTRY_CONFIGURATION_PATH}

@@ -1,44 +1,33 @@

 #

 # This is an OpenShift Origin node image with integrated OpenvSwitch SDN

-# If you do not require OVS SDN you should just use the origin image

+# If you do not require OVS SDN use the openshift/origin image instead.

+#

+# This image expects to have a volume mounted at /etc/origin/node that contains

+# a KUBECONFIG file giving the node permission to talk to the master and a

+# node configuration file.

 #

 # The standard name for this image is openshift/node

 #

-

 FROM openshift/origin

-# Based on work by: Peter Schiffer <pschiffe@redhat.com>

-MAINTAINER Devan Goodwin <dgoodwin@redhat.com>

+COPY bin/* /usr/bin/

+COPY conf/openshift-sdn-ovs.conf /usr/lib/systemd/system/origin-node.service.d/

+COPY lib/systemd/system/docker.service.d/docker-sdn-ovs.conf /usr/lib/systemd/system/docker.service.d/docker-sdn-ovs.conf

+COPY scripts/* /usr/local/bin/

-# We need to install openvswitch for the client portions, the daemons are expected

-# to run in another container

-

-ADD https://copr.fedoraproject.org/coprs/maxamillion/origin-next/repo/epel-7/maxamillion-origin-next-epel-7.repo /etc/yum.repos.d/

-RUN INSTALL_PKGS="libmnl libnetfilter_conntrack openvswitch \

-    libnfnetlink iptables iproute bridge-utils procps-ng ethtool socat openssl \

-    binutils xz kmod-libs kmod sysvinit-tools device-mapper-libs dbus \

-    ceph-common iscsi-initiator-utils" && \

+RUN curl -L -o /etc/yum.repos.d/origin-next-epel-7.repo https://copr.fedoraproject.org/coprs/maxamillion/origin-next/repo/epel-7/maxamillion-origin-next-epel-7.repo && \

+    INSTALL_PKGS="libmnl libnetfilter_conntrack openvswitch \

+      libnfnetlink iptables iproute bridge-utils procps-ng ethtool socat openssl \

+      binutils xz kmod-libs kmod sysvinit-tools device-mapper-libs dbus \

+      ceph-common iscsi-initiator-utils" && \

     yum install -y $INSTALL_PKGS && \

     rpm -V $INSTALL_PKGS && \

-    yum clean all

-

-RUN mkdir -p \

-    /usr/lib/systemd/system/origin-node.service.d \

-    /usr/lib/systemd/system/docker.service.d

-

-# All of the following are placed in images/node by hack/build-images.sh

-# They won't exist in the git checkout

-ADD bin/* /usr/bin/

-ADD conf/openshift-sdn-ovs.conf /usr/lib/systemd/system/origin-node.service.d/

-ADD lib/systemd/system/docker.service.d/docker-sdn-ovs.conf /usr/lib/systemd/system/docker.service.d/docker-sdn-ovs.conf

-ADD scripts/* /usr/local/bin/

-RUN chmod +x /usr/local/bin/* /usr/bin/openshift-*

-

-VOLUME [ "/etc/origin/node", "/var/lib/origin" ]

-WORKDIR /var/lib/origin

-

-ENV HOME /root

-ENV OPENSHIFT_CONTAINERIZED true

-ENV KUBECONFIG /etc/origin/node/node.kubeconfig

-ENTRYPOINT []

-CMD [ "/usr/local/bin/origin-node-run.sh" ]

+    yum clean all && \

+    mkdir -p /usr/lib/systemd/system/origin-node.service.d /usr/lib/systemd/system/docker.service.d && \

+    chmod +x /usr/local/bin/* /usr/bin/openshift-*

+

+LABEL io.k8s.display-name="OpenShift Origin Node" \

+      io.k8s.description="This is a component of OpenShift Origin and contains the software for individual nodes when using SDN."

+VOLUME /etc/origin/node

+ENV KUBECONFIG=/etc/origin/node/node.kubeconfig

+ENTRYPOINT [ "/usr/local/bin/origin-node-run.sh" ]

@@ -2,21 +2,16 @@

 set -eu

+hostetc=${HOST_ETC:-/rootfs/etc}

 conf=${CONFIG_FILE:-/etc/origin/node/node-config.yaml}

 opts=${OPTIONS:---loglevel=2}

-

-function quit {

-    pkill -g 0 openshift

-    exit 0

-}

-

-trap quit SIGTERM

-

-if [ ! -f ${HOST_ETC}/systemd/system/docker.service.d/docker-sdn-ovs.conf ]; then

-    mkdir -p ${HOST_ETC}/systemd/system/docker.service.d

-    cp /usr/lib/systemd/system/docker.service.d/docker-sdn-ovs.conf ${HOST_ETC}/systemd/system/docker.service.d

+if [ "$#" -ne 0 ]; then

+  opts=""

 fi

-/usr/bin/openshift start node "--config=${conf}" "${opts}" &

+if [ ! -f ${hostetc}/systemd/system/docker.service.d/docker-sdn-ovs.conf ]; then

+    mkdir -p ${hostetc}/systemd/system/docker.service.d

+    cp /usr/lib/systemd/system/docker.service.d/docker-sdn-ovs.conf ${hostetc}/systemd/system/docker.service.d

+fi

-while true; do sleep 5; done

+exec /usr/bin/openshift start node "--config=${conf}" "${opts}" $@

@@ -3,25 +3,19 @@

 #

 # The standard name for this image is openshift/openvswitch

 #

-

 FROM centos:centos7

-MAINTAINER Scott Dodson <sdodson@redhat.com>

-

-ADD https://copr.fedoraproject.org/coprs/maxamillion/origin-next/repo/epel-7/maxamillion-origin-next-epel-7.repo /etc/yum.repos.d/

+COPY scripts/* /usr/local/bin/

-# TODO: systemd update from centos 7.1 -> 7.2 is broken, remove this once 7.2

-# base images land

-RUN yum swap -y -- remove systemd-container\* -- install systemd systemd-libs

-

-RUN INSTALL_PKGS="openvswitch" && \

+RUN curl -L -o /etc/yum.repos.d/origin-next-epel-7.repo https://copr.fedoraproject.org/coprs/maxamillion/origin-next/repo/epel-7/maxamillion-origin-next-epel-7.repo && \

+    INSTALL_PKGS="openvswitch" && \

     yum install -y $INSTALL_PKGS && \

     rpm -V $INSTALL_PKGS && \

-    yum clean all

-

-ADD  scripts/* /usr/local/bin/

-RUN chmod +x /usr/local/bin/*

-VOLUME [ "/etc/openswitch" ]

+    yum clean all && \

+    chmod +x /usr/local/bin/*

+LABEL io.k8s.display-name="OpenShift Origin OpenVSwitch Daemon" \

+      io.k8s.description="This is a component of OpenShift Origin and runs an OpenVSwitch daemon process."

+VOLUME /etc/openswitch

 ENV HOME /root

-ENTRYPOINT [ "/usr/local/bin/ovs-run.sh" ]

+ENTRYPOINT ["/usr/local/bin/ovs-run.sh"]

@@ -10,23 +10,25 @@

 #

 FROM openshift/origin-base

-RUN mkdir -p /var/lib/origin

-

-ADD bin/openshift /usr/bin/openshift

+COPY bin/openshift /usr/bin/openshift

 RUN ln -s /usr/bin/openshift /usr/bin/oc && \

     ln -s /usr/bin/openshift /usr/bin/oadm && \

-    ln -s /usr/bin/openshift /usr/bin/osc && \

-    ln -s /usr/bin/openshift /usr/bin/osadm && \

+    ln -s /usr/bin/openshift /usr/bin/origin && \

     ln -s /usr/bin/openshift /usr/bin/kubectl && \

     ln -s /usr/bin/openshift /usr/bin/openshift-deploy && \

+    ln -s /usr/bin/openshift /usr/bin/openshift-recycle && \

+    ln -s /usr/bin/openshift /usr/bin/openshift-router && \

     ln -s /usr/bin/openshift /usr/bin/openshift-docker-build && \

     ln -s /usr/bin/openshift /usr/bin/openshift-sti-build && \

     ln -s /usr/bin/openshift /usr/bin/openshift-f5-router && \

     setcap 'cap_net_bind_service=ep' /usr/bin/openshift

-ENV HOME /root

-ENV OPENSHIFT_CONTAINERIZED true

-ENV KUBECONFIG /var/lib/origin/openshift.local.config/master/admin.kubeconfig

+LABEL io.k8s.display-name="OpenShift Origin Application Platform" \

+      io.k8s.description="OpenShift Origin is a platform for developing, building, and deploying containerized applications. See https://docs.openshift.org/latest for more on running OpenShift Origin."

+ENV HOME=/root \

+    OPENSHIFT_CONTAINERIZED=true \

+    KUBECONFIG=/var/lib/origin/openshift.local.config/master/admin.kubeconfig

+VOLUME /var/lib/origin

 WORKDIR /var/lib/origin

 EXPOSE 8443 53

 ENTRYPOINT ["/usr/bin/openshift"]

@@ -8,6 +8,9 @@

 #

 FROM scratch

-ADD bin/pod /pod

+COPY bin/pod /pod

+USER 1001

+LABEL io.k8s.display-name="OpenShift Origin Pod Infrastructure" \

+      io.k8s.description="This is a component of OpenShift Origin and holds on to the shared Linux namespaces within a Pod."

 ENTRYPOINT ["/pod"]

@@ -23,10 +23,12 @@ RUN mkdir $TMPDIR && \

     go get golang.org/x/tools/cmd/cover github.com/tools/godep github.com/golang/lint/golint && \

     touch /os-build-image

-WORKDIR /go/src/github.com/openshift/origin

-

 # Allows building Origin sources mounted using volume

-ADD openshift-origin-build.sh /usr/bin/openshift-origin-build.sh

+COPY openshift-origin-build.sh /usr/bin/openshift-origin-build.sh

+

+WORKDIR /go/src/github.com/openshift/origin

+LABEL io.k8s.display-name="OpenShift Origin Release Environment" \

+      io.k8s.description="This is the standard release image for OpenShift Origin and contains the necessary build tools to build the platform."

 # Expect a tar with the source of OpenShift Origin (and /os-version-defs in the root)

-CMD tar mxzf - && hack/build-cross.sh

+CMD bsdtar mxzf - && hack/build-cross.sh