Merge pull request #3683 from ReillyProcentive/fix-issue-3342

Add wrapper script to weave-npc
weaveworks · Aug 28, 2019 · d3f6290 · d3f6290
2 parents 22b3393 + ef26b30
commit d3f6290
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/prog/weave-npc/Dockerfile.template b/prog/weave-npc/Dockerfile.template
@@ -27,7 +27,8 @@ RUN apk add --update \
   && mknod /var/log/ulogd.pcap p
 COPY ./weave-npc /usr/bin/weave-npc
 COPY ./ulogd.conf /etc/ulogd.conf
-ENTRYPOINT ["/usr/bin/weave-npc"]
+COPY ./launch.sh /usr/bin/
+ENTRYPOINT ["/usr/bin/launch.sh"]
 
 # These labels will change for every build, and should therefore be the last layer of the image:
 ARG revision

diff --git a/prog/weave-npc/launch.sh b/prog/weave-npc/launch.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -e
+
+# Start weave-npc with any flags specified in $EXTRA_ARGS as well as any flags passed to this container (for backwards compatibility)
+exec /usr/bin/weave-npc $EXTRA_ARGS $@