docker: don't overwrite root fs

nsqio · Aug 8, 2015 · 275c3b3 · 275c3b3
1 parent 925f82a
commit 275c3b3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,8 @@
 FROM busybox
 
-ADD dist/docker/bin/ /
+ADD dist/docker/bin/ /nsq_bin/
+RUN cd /    && ln -s /nsq_bin/* . \
+ && cd /bin && ln -s /nsq_bin/* .
 
 EXPOSE 4150 4151 4160 4161 4170 4171
 

diff --git a/dist.sh b/dist.sh
@@ -18,10 +18,14 @@ set -e
 # build binary distributions for linux/amd64 and darwin/amd64
 
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-mkdir -p $DIR/dist
-rm -rf $DIR/dist/docker
+if [ -e $DIR/dist/docker ]; then
+    rm -rf $DIR/dist/docker
+fi
 mkdir -p $DIR/dist/docker
 
+if [ -e $DIR/.godeps ]; then
+    rm -rf $DIR/.godeps
+fi
 mkdir -p $DIR/.godeps
 export GOPATH=$DIR/.godeps:$GOPATH
 GOPATH=$DIR/.godeps gpm install