From 7e1f62bbe26f0734ea953a2b03f77ae091bd8060 Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
Date: Thu, 13 Jun 2019 16:08:07 +0100
Subject: [PATCH] Take snapshots of js packages for docker image

---
 docker/.gitignore                   |  1 +
 docker/Dockerfile                   |  3 +++
 docker/build-docker.sh              | 20 ++++++++++++++++++++
 docker/docker-server.sh             |  1 -
 docker/service/syndicate-server/run |  7 +++++--
 5 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 docker/.gitignore

diff --git a/docker/.gitignore b/docker/.gitignore
new file mode 100644
index 0000000..1ac89b6
--- /dev/null
+++ b/docker/.gitignore
@@ -0,0 +1 @@
+built-packages/
diff --git a/docker/Dockerfile b/docker/Dockerfile
index a8f170e..19fd397 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -11,6 +11,9 @@ RUN apk add --no-cache nodejs npm
 RUN npm i -g preserves
 ENV NODE_PATH=/usr/lib/node_modules
 
+ADD built-packages /tmp/packages
+RUN npm i --unsafe-perm -g /tmp/packages/*
+
 # RUN apk add --no-cache daemontools --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing
 
 RUN apk add dbus avahi avahi-tools
diff --git a/docker/build-docker.sh b/docker/build-docker.sh
index b91b1fa..8145d43 100755
--- a/docker/build-docker.sh
+++ b/docker/build-docker.sh
@@ -1,2 +1,22 @@
 #!/bin/sh
+set -xe
+
+rm -rf built-packages
+mkdir built-packages
+(cd built-packages && npm pack -q $(
+         for p in \
+             core \
+             driver-browser-ui \
+             driver-http-node \
+             driver-mdns \
+             driver-streams-node \
+             driver-timer \
+             driver-udp-node \
+             driver-websocket \
+             server \
+             syntax-playground
+         do
+             echo ../../packages/$p
+         done))
+
 docker build -t syndicate-js "$(dirname "$0")"
diff --git a/docker/docker-server.sh b/docker/docker-server.sh
index 30f5424..09b2f12 100755
--- a/docker/docker-server.sh
+++ b/docker/docker-server.sh
@@ -22,6 +22,5 @@ fi
 exec docker run -it --rm \
      --network ${networkname} \
      $nameopt \
-     -v "${dir}":/data \
      "$@" \
      syndicate-js
diff --git a/docker/service/syndicate-server/run b/docker/service/syndicate-server/run
index 32a5c60..a414311 100755
--- a/docker/service/syndicate-server/run
+++ b/docker/service/syndicate-server/run
@@ -1,4 +1,7 @@
 #!/bin/sh
 s6-svwait ../avahi-daemon
-cd /data/packages/server
-DEBUG='syndicate/server:*' exec node lib/index.js --http 8000 --tcp 8001 --monitor 8000 --overlay test ws://test-server.syndicate-lang.org/
+cd /usr/lib/node_modules/@syndicate-lang/server
+DEBUG='syndicate/server:*' exec node lib/index.js \
+     --http 8000 --monitor 8000 \
+     --unix /var/run/syndicate.sock \
+     --overlay test ws://test-server.syndicate-lang.org/