From 93b4a1033e3c737507fd691eec76a3efeb841705 Mon Sep 17 00:00:00 2001 From: Tong Zhang Date: Fri, 13 Mar 2020 14:02:28 +0800 Subject: [PATCH 1/2] adjust command order so net bridge is configured after docker started to avoid missing kernel modules --- .../application/wecube/install-wecube.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/delivery-wecube-for-stand-alone/application/wecube/install-wecube.sh b/delivery-wecube-for-stand-alone/application/wecube/install-wecube.sh index 62e67c1..0667780 100755 --- a/delivery-wecube-for-stand-alone/application/wecube/install-wecube.sh +++ b/delivery-wecube-for-stand-alone/application/wecube/install-wecube.sh @@ -4,12 +4,12 @@ yum install docker-compose -y echo "OPTIONS=-H unix:///var/run/docker.sock -H tcp://0.0.0.0:2375" >> /etc/sysconfig/docker +systemctl enable docker.service +systemctl start docker.service + echo "net.ipv4.ip_forward=1" >> /etc/sysctl.conf echo "net.bridge.bridge-nf-call-ip6tables = 1" >> /etc/sysctl.conf echo "net.bridge.bridge-nf-call-iptables = 1" >> /etc/sysctl.conf sysctl -p -systemctl start docker.service -systemctl enable docker.service - ./setup-wecube-containers.sh $@ From f6f25374fd947969be0164f8ea54afb9a6d5b27a Mon Sep 17 00:00:00 2001 From: Tong Zhang Date: Fri, 13 Mar 2020 17:03:37 +0800 Subject: [PATCH 2/2] adjust command order according to review comments --- .../application/wecube/install-wecube.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/delivery-wecube-for-stand-alone/application/wecube/install-wecube.sh b/delivery-wecube-for-stand-alone/application/wecube/install-wecube.sh index 0667780..026804d 100755 --- a/delivery-wecube-for-stand-alone/application/wecube/install-wecube.sh +++ b/delivery-wecube-for-stand-alone/application/wecube/install-wecube.sh @@ -7,9 +7,9 @@ echo "OPTIONS=-H unix:///var/run/docker.sock -H tcp://0.0.0.0:2375" >> /etc/sysc systemctl enable docker.service systemctl start docker.service +./setup-wecube-containers.sh $@ + echo "net.ipv4.ip_forward=1" >> /etc/sysctl.conf echo "net.bridge.bridge-nf-call-ip6tables = 1" >> /etc/sysctl.conf echo "net.bridge.bridge-nf-call-iptables = 1" >> /etc/sysctl.conf sysctl -p - -./setup-wecube-containers.sh $@