From 40a25ecf9445eb5408983b367579e8e4083f2077 Mon Sep 17 00:00:00 2001
From: Peter Bourgon <peter@bourgon.org>
Date: Mon, 29 Jun 2015 18:45:03 +0200
Subject: [PATCH] In Docker, {app,probe} -> {scope-app,scope-probe}

---
 .gitignore           | 6 ++++--
 Makefile             | 7 ++++---
 docker/Dockerfile    | 2 +-
 docker/entrypoint.sh | 4 ++--
 docker/run-app       | 2 +-
 docker/run-probe     | 2 +-
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index f5472e7877..09088897b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,9 +34,11 @@ coverage.html
 scope.tar
 scope_ui_build.tar
 app/app
+app/scope-app
 probe/probe
-docker/app
-docker/probe
+probe/scope-probe
+docker/scope-app
+docker/scope-probe
 experimental/bridge/bridge
 experimental/demoprobe/demoprobe
 experimental/fixprobe/fixprobe
diff --git a/Makefile b/Makefile
index c5ffb3e40f..11ae6e1522 100644
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,8 @@
 SUDO=sudo
 DOCKER_SQUASH=$(shell which docker-squash)
 DOCKERHUB_USER=weaveworks
-APP_EXE=app/app
-PROBE_EXE=probe/probe
+APP_EXE=app/scope-app
+PROBE_EXE=probe/scope-probe
 FIXPROBE_EXE=experimental/fixprobe/fixprobe
 SCOPE_IMAGE=$(DOCKERHUB_USER)/scope
 SCOPE_EXPORT=scope.tar
@@ -17,7 +17,8 @@ all: $(SCOPE_EXPORT)
 
 $(SCOPE_EXPORT): $(APP_EXE) $(PROBE_EXE) docker/*
 	@if [ -z '$(DOCKER_SQUASH)' ]; then echo "Please install docker-squash by running 'make deps'." && exit 1; fi
-	cp $(APP_EXE) $(PROBE_EXE) docker/
+	cp $(APP_EXE) docker/scope-app
+	cp $(PROBE_EXE) docker/scope-probe
 	$(SUDO) docker build -t $(SCOPE_IMAGE) docker/
 	$(SUDO) docker save $(SCOPE_IMAGE):latest | sudo $(DOCKER_SQUASH) -t $(SCOPE_IMAGE) | tee $@ | $(SUDO) docker load
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 079ead9f0f..974f012d9d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -4,7 +4,7 @@ WORKDIR /home/weave
 RUN echo "http://dl-4.alpinelinux.org/alpine/edge/testing" >>/etc/apk/repositories && \
 	apk add --update runit conntrack-tools && \
 	rm -rf /var/cache/apk/*
-COPY ./app ./probe ./entrypoint.sh /home/weave/
+COPY ./scope-app ./scope-probe ./entrypoint.sh /home/weave/
 COPY ./run-app /etc/service/app/run
 COPY ./run-probe /etc/service/probe/run
 EXPOSE 4040
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 2d3a14a1cf..fcc4d477fc 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -44,8 +44,8 @@ while true; do
 done
 
 mkdir -p /etc/weave
-echo "$APP_ARGS" >/etc/weave/app.args
-echo "$PROBE_ARGS" >/etc/weave/probe.args
+echo "$APP_ARGS" >/etc/weave/scope-app.args
+echo "$PROBE_ARGS" >/etc/weave/scope-probe.args
 
 if [ -n "$DNS_SERVER" -a -n "$SEARCHPATH" ]; then
     echo "domain $SEARCHPATH" >/etc/resolv.conf
diff --git a/docker/run-app b/docker/run-app
index bdd45c939a..05545c852f 100755
--- a/docker/run-app
+++ b/docker/run-app
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec /home/weave/app $(cat /etc/weave/app.args) $(cat /etc/weave/probes)
+exec /home/weave/scope-app $(cat /etc/weave/scope-app.args) $(cat /etc/weave/probes)
diff --git a/docker/run-probe b/docker/run-probe
index 718c26ab80..f6918711e4 100755
--- a/docker/run-probe
+++ b/docker/run-probe
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec /home/weave/probe $(cat /etc/weave/probe.args)
+exec /home/weave/scope-probe $(cat /etc/weave/probe.args)