From ca685765dd4d15564319ae76f61fe59a63a81b7e Mon Sep 17 00:00:00 2001 From: Dawid Malinowski Date: Thu, 9 Jul 2015 13:45:56 +0200 Subject: [PATCH] Move back to --net=host --- pinpoint-collector/Dockerfile | 6 +++++- pinpoint-hbase/Dockerfile | 2 +- pinpoint-web/Dockerfile | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pinpoint-collector/Dockerfile b/pinpoint-collector/Dockerfile index 4b8ecd4..c4c82ee 100644 --- a/pinpoint-collector/Dockerfile +++ b/pinpoint-collector/Dockerfile @@ -1,6 +1,6 @@ # DESCRIPTION Pinpoint APM Collector # TO_BUILD docker build -t pinpoint-collector . -# TO_RUN docker run -d -e HBASE_HOST= -e HBASE_PORT=2181 -e COLLECTOR_TCP_PORT=9994 -e COLLECTOR_UDP_STAT_LISTEN_PORT=9995 -e COLLECTOR_UDP_SPAN_LISTEN_PORT=9996 -p 9994:9994 -p 9995:9995/udp -p 9996:9996/udp --name=pinpoint-collector pinpoint-collector +# TO_RUN docker run -d --net=host -e HBASE_HOST= -e HBASE_PORT=2181 -e COLLECTOR_TCP_PORT=9994 -e COLLECTOR_UDP_STAT_LISTEN_PORT=9995 -e COLLECTOR_UDP_SPAN_LISTEN_PORT=9996 -p 9994:9994 -p 9995:9995/udp -p 9996:9996/udp --name=pinpoint-collector pinpoint-collector FROM tomcat:8-jre8 @@ -9,6 +9,10 @@ ENV PINPOINT_VERSION 1.1.0 RUN curl -SL "https://github.com/naver/pinpoint/releases/download/$PINPOINT_VERSION/pinpoint-collector-$PINPOINT_VERSION.war" -o pinpoint-collector.war && \ rm -rf /usr/local/tomcat/webapps && \ mkdir -p /usr/local/tomcat/webapps && \ + sed -i -e 's/8005/9005/' /usr/local/tomcat/conf/server.xml && \ + sed -i -e 's/8080/9080/' /usr/local/tomcat/conf/server.xml && \ + sed -i -e 's/8009/9009/' /usr/local/tomcat/conf/server.xml && \ + sed -i -e 's/8443/9443/' /usr/local/tomcat/conf/server.xml && \ unzip pinpoint-collector.war -d /usr/local/tomcat/webapps/ROOT && \ rm -rf pinpoint-collector.war diff --git a/pinpoint-hbase/Dockerfile b/pinpoint-hbase/Dockerfile index 446acdb..5fce92a 100644 --- a/pinpoint-hbase/Dockerfile +++ b/pinpoint-hbase/Dockerfile @@ -1,6 +1,6 @@ # DESCRIPTION Pinpoint APM HBase (Data Storage) # TO_BUILD docker build -t pinpoint-hbase . -# TO_RUN docker run -d -p 2181:2181 -p 60000:60000 -p 60010:60010 -p 60020:60020 -p 60030:60030 --name=pinpoint-hbase pinpoint-hbase +# TO_RUN docker run -d --net=host -p 2181:2181 -p 60000:60000 -p 60010:60010 -p 60020:60020 -p 60030:60030 --name=pinpoint-hbase pinpoint-hbase FROM java:8-jdk diff --git a/pinpoint-web/Dockerfile b/pinpoint-web/Dockerfile index 388584e..49e9007 100644 --- a/pinpoint-web/Dockerfile +++ b/pinpoint-web/Dockerfile @@ -1,6 +1,6 @@ # DESCRIPTION Pinpoint APM Web (User Interface) # TO_BUILD docker build -t pinpoint-web . -# TO_RUN docker run -d -p 8080:8080 -e HBASE_HOST= -e HBASE_PORT=2181 --name=pinpoint-web pinpoint-web +# TO_RUN docker run -d -p 8080:8080 --net=host -e HBASE_HOST= -e HBASE_PORT=2181 --name=pinpoint-web pinpoint-web FROM tomcat:8-jre8