From cbf03ffe02b7b77f9577b3d695da9d2abb8432d2 Mon Sep 17 00:00:00 2001 From: apatil Date: Tue, 12 Aug 2014 20:43:51 +0000 Subject: [PATCH 1/5] Running socat to proxy local port 4001 to etcd socket --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index c1103a3..097e58c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:12.04 RUN apt-get update -RUN apt-get install -y python-software-properties python g++ make +RUN apt-get install -y python-software-properties python g++ make socat RUN add-apt-repository -y ppa:chris-lea/node.js RUN echo "deb http://archive.ubuntu.com/ubuntu precise universe" >> /etc/apt/sources.list RUN apt-get update @@ -11,6 +11,6 @@ ADD package.json /work/ RUN cd work && npm install ADD . /work ENV NODE_ENV production -ENV HIPACHE_DRIVER etcd://10.1.42.1:4001 -CMD ["/usr/bin/node", "/work/bin/hipache", "-c", "/work/config/config.json"] -EXPOSE 80 +ENV HIPACHE_DRIVER etcd://127.0.0.1:4001 +CMD socat TCP-LISTEN:4001,reuseaddr,fork UNIX-CLIENT:$ETCD_SOCKET & ./index.js & node /work/bin/hipache -c /work/config/config.json +EXPOSE 80 \ No newline at end of file From b073f2c4a097cdae74810b22837a78ca9944a8b3 Mon Sep 17 00:00:00 2001 From: apatil Date: Wed, 13 Aug 2014 01:36:06 +0000 Subject: [PATCH 2/5] hardcoded etcd socket in dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 097e58c..b0e4828 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,5 +12,5 @@ RUN cd work && npm install ADD . /work ENV NODE_ENV production ENV HIPACHE_DRIVER etcd://127.0.0.1:4001 -CMD socat TCP-LISTEN:4001,reuseaddr,fork UNIX-CLIENT:$ETCD_SOCKET & ./index.js & node /work/bin/hipache -c /work/config/config.json +CMD socat TCP-LISTEN:4001,reuseaddr,fork UNIX-CLIENT:/run/etcd/etcd.sock & ./index.js & node /work/bin/hipache -c /work/config/config.json EXPOSE 80 \ No newline at end of file From 719143c2dc59983af3f41af41b382a903fd676f9 Mon Sep 17 00:00:00 2001 From: Tristan Zajonc Date: Mon, 18 Aug 2014 13:44:29 -0700 Subject: [PATCH 3/5] bumped node version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b0e4828..59664c7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ RUN apt-get install -y python-software-properties python g++ make socat RUN add-apt-repository -y ppa:chris-lea/node.js RUN echo "deb http://archive.ubuntu.com/ubuntu precise universe" >> /etc/apt/sources.list RUN apt-get update -RUN apt-get -y install nodejs=0.10.29-1chl1~precise1 +RUN apt-get -y install nodejs=0.10.30-1chl1~precise1 RUN npm install node-etcd@2.1.1 -g RUN mkdir /work ADD package.json /work/ From 87026469dd9f31e165d426fb981142adf3d134ed Mon Sep 17 00:00:00 2001 From: Tristan Zajonc Date: Mon, 18 Aug 2014 14:10:20 -0700 Subject: [PATCH 4/5] Small fix --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 59664c7..e0accde 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,5 +12,5 @@ RUN cd work && npm install ADD . /work ENV NODE_ENV production ENV HIPACHE_DRIVER etcd://127.0.0.1:4001 -CMD socat TCP-LISTEN:4001,reuseaddr,fork UNIX-CLIENT:/run/etcd/etcd.sock & ./index.js & node /work/bin/hipache -c /work/config/config.json +CMD socat TCP-LISTEN:4001,reuseaddr,fork UNIX-CLIENT:/run/etcd/etcd.sock & node /work/bin/hipache -c /work/config/config.json EXPOSE 80 \ No newline at end of file From 36709c59b250757b57324efe7495611feb0db349 Mon Sep 17 00:00:00 2001 From: Anand Patil Date: Wed, 20 Aug 2014 13:41:13 -0700 Subject: [PATCH 5/5] Dockerfile leverages senseplatform/base --- Dockerfile | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index b0e4828..01575b8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,8 @@ -FROM ubuntu:12.04 -RUN apt-get update -RUN apt-get install -y python-software-properties python g++ make socat -RUN add-apt-repository -y ppa:chris-lea/node.js -RUN echo "deb http://archive.ubuntu.com/ubuntu precise universe" >> /etc/apt/sources.list -RUN apt-get update -RUN apt-get -y install nodejs=0.10.29-1chl1~precise1 +FROM senseplatform/base RUN npm install node-etcd@2.1.1 -g RUN mkdir /work ADD package.json /work/ -RUN cd work && npm install +RUN cd /work && npm install ADD . /work ENV NODE_ENV production ENV HIPACHE_DRIVER etcd://127.0.0.1:4001