-- add run script

SchwarzM · Aug 22, 2015 · 20ea5b9 · 20ea5b9
1 parent b364f0c
commit 20ea5b9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -7,9 +7,10 @@ RUN apk-install quagga \
                 supervisor
 
 ADD supervisord.conf /etc/supervisord.conf
-ADD zebra.conf.sample /etc/quagga/zebra.conf
-ADD ospfd.conf.sample /etc/quagga/ospfd.conf
+ADD k8s-quagga /k8s-quagga
+ADD run.sh /run.sh
+RUN chmod +x /run.sh
 
 EXPOSE 179 2601 2604
 
-CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"]
+CMD ["/run.sh"]
diff --git a/docker/run.sh b/docker/run.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -ex
+
+# generate zebra conf
+./k8s-quagga zebra
+
+# generate ospfd conf
+./k8s-quagga ospfd --Interface ${K8S_QUAGGA_INTERFACE} --RouterId ${K8S_QUAGGA_ROUTERID} --PortalNet ${K8S_QUAGGA_PORTALNET} --ContainerNet ${K8S_QUAGGA_CONTAINERNET}
+
+exec /usr/bin/supervisord -c /etc/supervisord.conf