Move dependencies out of the base image and into children

Reduces the size of the base image. RPMs explicitly list all their dependencies to prevent accidental removal.
openshift · May 2, 2018 · 4333db3 · 4333db3
1 parent 57e7c6c
commit 4333db3
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 25 deletions.
diff --git a/images/base/Dockerfile b/images/base/Dockerfile
@@ -8,12 +8,9 @@ FROM openshift/origin-source
 
 COPY *.repo /etc/yum.repos.d/
 RUN INSTALL_PKGS=" \
-      which git tar wget hostname sysvinit-tools util-linux bsdtar \
-      socat ethtool device-mapper iptables tree findutils nmap-ncat e2fsprogs \
-      xfsprogs lsof device-mapper-persistent-data ceph-common \
+      which tar wget hostname sysvinit-tools util-linux \
+      socat tree findutils lsof bind-utils \
       " && \
-    yum install -y centos-release-ceph-luminous && \
-    rpm -V centos-release-ceph-luminous && \
     yum install -y ${INSTALL_PKGS} && \
     rpm -V ${INSTALL_PKGS} && \
     yum clean all && \

diff --git a/images/base/Dockerfile.centos7 b/images/base/Dockerfile.centos7
@@ -7,12 +7,9 @@
 FROM openshift/origin-source
 
 RUN INSTALL_PKGS=" \
-      which git tar wget hostname sysvinit-tools util-linux bsdtar \
-      socat ethtool device-mapper iptables tree findutils nmap-ncat e2fsprogs \
-      xfsprogs lsof device-mapper-persistent-data ceph-common \
+      which tar wget hostname sysvinit-tools util-linux \
+      socat tree findutils lsof bind-utils \
       " && \
-    yum install -y centos-release-ceph-luminous && \
-    rpm -V centos-release-ceph-luminous && \
     yum install -y ${INSTALL_PKGS} && \
     rpm -V ${INSTALL_PKGS} && \
     yum clean all && \

diff --git a/images/base/Dockerfile.rhel7 b/images/base/Dockerfile.rhel7
@@ -7,9 +7,8 @@
 FROM rhel7
 
 RUN INSTALL_PKGS=" \
-      which git tar wget hostname sysvinit-tools util-linux bsdtar \
-      socat ethtool device-mapper iptables tree findutils nmap-ncat e2fsprogs \
-      xfsprogs lsof device-mapper-persistent-data ceph-common \
+      which tar wget hostname sysvinit-tools util-linux \
+      socat tree findutils lsof bind-utils \
       " && \
     yum --disablerepo=origin-local-release install -y $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \

diff --git a/images/builder/docker/docker-builder/Dockerfile b/images/builder/docker/docker-builder/Dockerfile
@@ -12,7 +12,16 @@
 #
 FROM openshift/origin-control-plane
 
-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." \
+RUN INSTALL_PKGS=" \
+      which tar wget hostname sysvinit-tools util-linux \
+      socat tree findutils lsof bind-utils \
+      git tar bsdtar \
+      " && \
+    yum install -y ${INSTALL_PKGS} && \
+    rpm -V ${INSTALL_PKGS} && \
+    yum clean all
+
+LABEL io.k8s.display-name="OpenShift Origin Builder" \
+      io.k8s.description="This is a component of OpenShift Origin and is responsible for executing image builds." \
       io.openshift.tags="openshift,builder"
 ENTRYPOINT ["/usr/bin/openshift-docker-build"]
diff --git a/images/node/Dockerfile b/images/node/Dockerfile
@@ -13,10 +13,16 @@ COPY scripts/* /usr/local/bin/
 COPY system-container/system-container-wrapper.sh /usr/local/bin/
 COPY system-container/manifest.json system-container/config.json.template system-container/service.template system-container/tmpfiles.template /exports/
 
-RUN INSTALL_PKGS="origin-sdn-ovs libmnl libnetfilter_conntrack conntrack-tools \
+RUN INSTALL_PKGS=" \
+      socat ethtool device-mapper iptables nmap-ncat e2fsprogs \
+      xfsprogs device-mapper-persistent-data ceph-common \
+      origin-sdn-ovs libmnl libnetfilter_conntrack conntrack-tools \
       libnfnetlink iptables iproute bridge-utils procps-ng ethtool socat openssl \
       binutils xz kmod-libs kmod sysvinit-tools device-mapper-libs dbus \
-      iscsi-initiator-utils bind-utils" && \
+      iscsi-initiator-utils bind-utils \
+      " && \
+    yum install -y centos-release-ceph-luminous && \
+    rpm -V centos-release-ceph-luminous && \
     yum --enablerepo=origin-local-release install -y $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
     yum clean all
@@ -25,6 +31,7 @@ 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." \
       io.openshift.tags="openshift,node"
 
-ENV KUBECONFIG=/etc/origin/node/node.kubeconfig
+ENV OPENSHIFT_CONTAINERIZED=true \
+    KUBECONFIG=/etc/origin/node/node.kubeconfig
 
 ENTRYPOINT [ "/usr/local/bin/origin-node-run.sh" ]
diff --git a/images/node/Dockerfile.centos7 b/images/node/Dockerfile.centos7
@@ -9,10 +9,16 @@ COPY scripts/* /usr/local/bin/
 COPY system-container/system-container-wrapper.sh /usr/local/bin/
 COPY system-container/manifest.json system-container/config.json.template system-container/service.template system-container/tmpfiles.template /exports/
 
-RUN INSTALL_PKGS="origin-sdn-ovs libmnl libnetfilter_conntrack conntrack-tools \
+RUN INSTALL_PKGS=" \
+      socat ethtool device-mapper iptables nmap-ncat e2fsprogs \
+      xfsprogs device-mapper-persistent-data ceph-common \
+      origin-sdn-ovs libmnl libnetfilter_conntrack conntrack-tools \
       libnfnetlink iptables iproute bridge-utils procps-ng ethtool socat openssl \
       binutils xz kmod-libs kmod sysvinit-tools device-mapper-libs dbus \
-      iscsi-initiator-utils bind-utils" && \
+      iscsi-initiator-utils bind-utils \
+      " && \
+    yum install -y centos-release-ceph-luminous && \
+    rpm -V centos-release-ceph-luminous && \
     yum --enablerepo=origin-local-release install -y $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
     yum clean all
@@ -21,6 +27,7 @@ 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." \
       io.openshift.tags="openshift,node"
 
-ENV KUBECONFIG=/etc/origin/node/node.kubeconfig
+ENV OPENSHIFT_CONTAINERIZED=true \
+    KUBECONFIG=/etc/origin/node/node.kubeconfig
 
 ENTRYPOINT [ "/usr/local/bin/origin-node-run.sh" ]
diff --git a/images/origin/Dockerfile b/images/origin/Dockerfile
@@ -17,7 +17,6 @@ LABEL io.k8s.display-name="OpenShift Origin Application Platform" \
       io.openshift.tags="openshift,core"
 
 ENV HOME=/root \
-    OPENSHIFT_CONTAINERIZED=true \
     KUBECONFIG=/var/lib/origin/openshift.local.config/master/admin.kubeconfig
 
 WORKDIR /var/lib/origin

diff --git a/images/origin/Dockerfile.centos7 b/images/origin/Dockerfile.centos7
@@ -17,7 +17,6 @@ LABEL io.k8s.display-name="OpenShift Origin Application Platform" \
       io.openshift.tags="openshift,core"
 
 ENV HOME=/root \
-    OPENSHIFT_CONTAINERIZED=true \
     KUBECONFIG=/var/lib/origin/openshift.local.config/master/admin.kubeconfig
 
 WORKDIR /var/lib/origin

diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go
diff --git a/test/extended/testdata/router-http-echo-server.yaml b/test/extended/testdata/router-http-echo-server.yaml
@@ -20,7 +20,7 @@ items:
           deploymentconfig: router-http-echo
       spec:
         containers:
-        - image: openshift/origin-base
+        - image: openshift/origin-node
           name: router-http-echo
           command:
             - /usr/bin/socat