Merge pull request #14441 from sdodson/bz1455472

Merged by openshift-bot

Author: OpenShift Bot

images/node/Dockerfile

@@ -10,6 +10,7 @@
 #
 FROM openshift/origin
 
+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/
 

images/node/Dockerfile.centos7

@@ -10,6 +10,7 @@
 #
 FROM openshift/origin
 
+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/
 

images/node/scripts/docker

@@ -15,4 +15,8 @@
 # because most installs currently mount /usr/bin/docker from the host into that
 # path.
 
-chroot /rootfs docker "${@}"
+if test -e /rootfs/usr/bin/docker; then
+    exec chroot /rootfs docker "${@}"
+fi
+
+exec /usr/bin/docker "${@}"

images/openvswitch/Dockerfile

@@ -5,6 +5,7 @@
 #
 FROM openshift/node
 
+COPY scripts/* /usr/local/bin/
 RUN INSTALL_PKGS="openvswitch" && \
     yum install -y ${INSTALL_PKGS} && \
     rpm -V ${INSTALL_PKGS} && \

origin.spec

@@ -322,14 +322,6 @@ install -m 0644 contrib/tuned/man/tuned-profiles-origin-node.7 %{buildroot}%{_ma
 
 mkdir -p %{buildroot}%{_sharedstatedir}/origin
 
-install -d %{buildroot}/usr/local/bin/
-
-# Install node scripts
-install -p -m 0755 images/node/scripts/* %{buildroot}/usr/local/bin/
-
-# Install openvswitch scripts
-install -p -m 0755 images/openvswitch/scripts/ovs-run.sh %{buildroot}/usr/local/bin/
-
 # Install sdn scripts
 install -d -m 0755 %{buildroot}%{_sysconfdir}/cni/net.d
 pushd pkg/sdn/plugin/sdn-cni-plugin
@@ -491,8 +483,6 @@ fi
 %config(noreplace) %{_sysconfdir}/origin/node
 %ghost %config(noreplace) %{_sysconfdir}/origin/node/node-config.yaml
 %ghost %config(noreplace) %{_sysconfdir}/origin/.config_managed
-/usr/local/bin/docker
-/usr/local/bin/origin-node-run.sh
 
 %post node
 %systemd_post %{name}-node.service
@@ -515,7 +505,6 @@ fi
 %{_unitdir}/%{name}-node.service.d/openshift-sdn-ovs.conf
 %{_sysconfdir}/cni/net.d/80-openshift-sdn.conf
 /opt/cni/bin/*
-/usr/local/bin/ovs-run.sh
 
 %posttrans sdn-ovs
 # This path was installed by older packages but the directory wasn't owned by