Merge pull request openshift#22502 from JacobTanenbaum/move-COPY

openshift-merge-robot · web-flow · commit d8a02810cc4e · 2019-04-17T11:53:43.000-07:00
Move the COPY scriptes to below the RUN INSTALL_PKGS for sdn image
diff --git a/images/sdn/Dockerfile.rhel b/images/sdn/Dockerfile.rhel
@@ -18,7 +18,6 @@ COPY --from=builder /tmp/build/openshift-sdn /usr/bin/
 COPY --from=builder /tmp/build/sdn-cni-plugin /opt/cni/bin/openshift-sdn
 COPY --from=builder /tmp/build/loopback /opt/cni/bin/
 COPY --from=builder /tmp/build/host-local /opt/cni/bin/
-COPY images/sdn/scripts/* /usr/sbin/
 
 RUN INSTALL_PKGS=" \
       openvswitch2.11 container-selinux socat ethtool nmap-ncat \
@@ -29,6 +28,15 @@ RUN INSTALL_PKGS=" \
     yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
     mkdir -p /etc/sysconfig/cni/net.d && \
     yum clean all && rm -rf /var/cache/*
+
+COPY ./images/sdn/scripts/iptables /usr/sbin/
+COPY ./images/sdn/scripts/iptables-save /usr/sbin/
+COPY ./images/sdn/scripts/iptables-restore /usr/sbin/
+COPY ./images/sdn/scripts/ip6tables /usr/sbin/
+COPY ./images/sdn/scripts/ip6tables-save /usr/sbin/
+COPY ./images/sdn/scripts/ip6tables-restore /usr/sbin/
+COPY ./images/sdn/scripts/iptables /usr/sbin/
+
 LABEL io.k8s.display-name="OpenShift SDN" \
       io.k8s.description="This is a component of OpenShift and contains the networking tool stack for the default SDN implementation." \
       io.openshift.tags="openshift,sdn"
diff --git a/images/sdn/scripts/ip6tables b/images/sdn/scripts/ip6tables
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec chroot /host /usr/sbin/ip6tables $@
+exec chroot /host /usr/sbin/ip6tables "$@"
diff --git a/images/sdn/scripts/ip6tables-restore b/images/sdn/scripts/ip6tables-restore
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec chroot /host /usr/sbin/ip6tables-restore $@
+exec chroot /host /usr/sbin/ip6tables-restore "$@"
diff --git a/images/sdn/scripts/ip6tables-save b/images/sdn/scripts/ip6tables-save
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec chroot /host /usr/sbin/ip6tables-save $@
+exec chroot /host /usr/sbin/ip6tables-save "$@"
diff --git a/images/sdn/scripts/iptables b/images/sdn/scripts/iptables
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec chroot /host /usr/sbin/iptables $@
+exec chroot /host /usr/sbin/iptables "$@"
diff --git a/images/sdn/scripts/iptables-restore b/images/sdn/scripts/iptables-restore
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec chroot /host /usr/sbin/iptables-restore $@
+exec chroot /host /usr/sbin/iptables-restore "$@"
diff --git a/images/sdn/scripts/iptables-save b/images/sdn/scripts/iptables-save
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec chroot /host /usr/sbin/iptables-save $@
+exec chroot /host /usr/sbin/iptables-save "$@"

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`
`3`		`-exec chroot /host /usr/sbin/ip6tables $@`
	`3`	`+exec chroot /host /usr/sbin/ip6tables "$@"`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`
`3`		`-exec chroot /host /usr/sbin/ip6tables-restore $@`
	`3`	`+exec chroot /host /usr/sbin/ip6tables-restore "$@"`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`
`3`		`-exec chroot /host /usr/sbin/iptables $@`
	`3`	`+exec chroot /host /usr/sbin/iptables "$@"`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`
`3`		`-exec chroot /host /usr/sbin/iptables-restore $@`
	`3`	`+exec chroot /host /usr/sbin/iptables-restore "$@"`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`
`3`		`-exec chroot /host /usr/sbin/iptables-save $@`
	`3`	`+exec chroot /host /usr/sbin/iptables-save "$@"`