From 3a92050ebb908f3898e351d0e7913e4c8677ae4e Mon Sep 17 00:00:00 2001
From: Reilly Brogan <Reilly@procentive.com>
Date: Thu, 8 Aug 2019 14:42:56 -0500
Subject: [PATCH 1/3] Add weave-npc wrapper script

---
 prog/weave-npc/Dockerfile.template | 3 ++-
 prog/weave-npc/launch.sh           | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100755 prog/weave-npc/launch.sh

diff --git a/prog/weave-npc/Dockerfile.template b/prog/weave-npc/Dockerfile.template
index 2499f2a9b9..175fbe092c 100644
--- 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 /home/weave/
+ENTRYPOINT ["/home/weave/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
new file mode 100755
index 0000000000..65930d668d
--- /dev/null
+++ 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 $@
\ No newline at end of file

From 1588a7259dc97a3ede55d8c95f05d83bf2e01c2b Mon Sep 17 00:00:00 2001
From: Reilly Brogan <Reilly@procentive.com>
Date: Thu, 8 Aug 2019 14:43:48 -0500
Subject: [PATCH 2/3] add newline

---
 prog/weave-npc/launch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prog/weave-npc/launch.sh b/prog/weave-npc/launch.sh
index 65930d668d..776ddd84ed 100755
--- a/prog/weave-npc/launch.sh
+++ b/prog/weave-npc/launch.sh
@@ -3,4 +3,4 @@
 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 $@
\ No newline at end of file
+exec /usr/bin/weave-npc $EXTRA_ARGS $@

From ef26b306e4bd10ada706c82c06c120a9f304773d Mon Sep 17 00:00:00 2001
From: Reilly Brogan <Reilly@procentive.com>
Date: Thu, 8 Aug 2019 14:52:29 -0500
Subject: [PATCH 3/3] Forgot to make this change

---
 prog/weave-npc/Dockerfile.template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/prog/weave-npc/Dockerfile.template b/prog/weave-npc/Dockerfile.template
index 175fbe092c..53f3884c73 100644
--- a/prog/weave-npc/Dockerfile.template
+++ b/prog/weave-npc/Dockerfile.template
@@ -27,8 +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
-COPY ./launch.sh /home/weave/
-ENTRYPOINT ["/home/weave/launch.sh"]
+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