diff --git a/Dockerfile b/Dockerfile index c1103a3..65b4d76 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,10 @@ -FROM ubuntu:12.04 -RUN apt-get update -RUN apt-get install -y python-software-properties python g++ make -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://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:/run/etcd/etcd.sock & node /work/bin/hipache -c /work/config/config.json +EXPOSE 80 \ No newline at end of file