From 200055dbe58f73284d80d31408259da313a3d726 Mon Sep 17 00:00:00 2001 From: Andrew Lau Date: Sat, 29 Jul 2017 12:51:07 +1000 Subject: [PATCH] Add back origin-sdn-ovs --- images/node/Dockerfile | 4 ++-- images/node/Dockerfile.centos7 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/node/Dockerfile b/images/node/Dockerfile index 41852e353e08..434d1c6e6d2a 100644 --- a/images/node/Dockerfile +++ b/images/node/Dockerfile @@ -14,11 +14,11 @@ 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="libmnl libnetfilter_conntrack conntrack-tools openvswitch \ +RUN INSTALL_PKGS="origin-sdn-ovs libmnl libnetfilter_conntrack conntrack-tools openvswitch \ 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" && \ - yum install -y $INSTALL_PKGS && \ + yum --enablerepo=origin-local-release install -y $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \ yum clean all && \ mkdir -p /usr/lib/systemd/system/origin-node.service.d /usr/lib/systemd/system/docker.service.d diff --git a/images/node/Dockerfile.centos7 b/images/node/Dockerfile.centos7 index 41852e353e08..434d1c6e6d2a 100644 --- a/images/node/Dockerfile.centos7 +++ b/images/node/Dockerfile.centos7 @@ -14,11 +14,11 @@ 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="libmnl libnetfilter_conntrack conntrack-tools openvswitch \ +RUN INSTALL_PKGS="origin-sdn-ovs libmnl libnetfilter_conntrack conntrack-tools openvswitch \ 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" && \ - yum install -y $INSTALL_PKGS && \ + yum --enablerepo=origin-local-release install -y $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \ yum clean all && \ mkdir -p /usr/lib/systemd/system/origin-node.service.d /usr/lib/systemd/system/docker.service.d