From 04da8883c4d4eea75f5f20fc7f8b4d0b7cf08fdb Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Tue, 21 Aug 2018 18:03:35 +0800
Subject: [PATCH] fix presto

---
 presto/Dockerfile                                        | 4 ++--
 presto/conf/coordinator/config.properties                | 2 +-
 presto/conf/standalone/config.properties                 | 2 +-
 presto/conf/{worker => worker1}/catalog/jmx.properties   | 0
 presto/conf/{worker => worker1}/catalog/tpcds.properties | 0
 presto/conf/{worker => worker1}/catalog/tpch.properties  | 0
 presto/conf/{worker => worker1}/config.properties        | 0
 presto/conf/{worker => worker1}/jvm.config               | 0
 presto/conf/{worker => worker1}/log.properties           | 0
 presto/conf/{worker => worker1}/node.properties          | 2 +-
 presto/docker-compose.yml                                | 8 ++++----
 11 files changed, 9 insertions(+), 9 deletions(-)
 rename presto/conf/{worker => worker1}/catalog/jmx.properties (100%)
 rename presto/conf/{worker => worker1}/catalog/tpcds.properties (100%)
 rename presto/conf/{worker => worker1}/catalog/tpch.properties (100%)
 rename presto/conf/{worker => worker1}/config.properties (100%)
 rename presto/conf/{worker => worker1}/jvm.config (100%)
 rename presto/conf/{worker => worker1}/log.properties (100%)
 rename presto/conf/{worker => worker1}/node.properties (78%)

diff --git a/presto/Dockerfile b/presto/Dockerfile
index 14607cd..352c25e 100644
--- a/presto/Dockerfile
+++ b/presto/Dockerfile
@@ -12,13 +12,13 @@ ENV PRESTO_HOME /opt/presto
 WORKDIR $PRESTO_HOME
 
 RUN set -xe \
-    && apk add --no-cache curl tar \
+    && apk add --no-cache curl python tar \
     && curl -sSL $PRESTO_URL | tar xz --strip 1 \
     && apk del curl tar
 
 VOLUME /var/presto/data
 
-EXPOSE 8080 8081
+EXPOSE 8080
 
 ENTRYPOINT ["./bin/launcher"]
 CMD ["run"]
diff --git a/presto/conf/coordinator/config.properties b/presto/conf/coordinator/config.properties
index 48d532e..67707f3 100644
--- a/presto/conf/coordinator/config.properties
+++ b/presto/conf/coordinator/config.properties
@@ -4,4 +4,4 @@ http-server.http.port=8080
 query.max-memory=50GB
 query.max-memory-per-node=1GB
 discovery-server.enabled=true
-discovery.uri=http://coordinator:8080
+discovery.uri=http://127.0.0.1:8080
diff --git a/presto/conf/standalone/config.properties b/presto/conf/standalone/config.properties
index ccf2afd..6e22c37 100644
--- a/presto/conf/standalone/config.properties
+++ b/presto/conf/standalone/config.properties
@@ -4,4 +4,4 @@ http-server.http.port=8080
 query.max-memory=5GB
 query.max-memory-per-node=1GB
 discovery-server.enabled=true
-discovery.uri=http://coordinator:8080
+discovery.uri=http://127.0.0.1:8080
diff --git a/presto/conf/worker/catalog/jmx.properties b/presto/conf/worker1/catalog/jmx.properties
similarity index 100%
rename from presto/conf/worker/catalog/jmx.properties
rename to presto/conf/worker1/catalog/jmx.properties
diff --git a/presto/conf/worker/catalog/tpcds.properties b/presto/conf/worker1/catalog/tpcds.properties
similarity index 100%
rename from presto/conf/worker/catalog/tpcds.properties
rename to presto/conf/worker1/catalog/tpcds.properties
diff --git a/presto/conf/worker/catalog/tpch.properties b/presto/conf/worker1/catalog/tpch.properties
similarity index 100%
rename from presto/conf/worker/catalog/tpch.properties
rename to presto/conf/worker1/catalog/tpch.properties
diff --git a/presto/conf/worker/config.properties b/presto/conf/worker1/config.properties
similarity index 100%
rename from presto/conf/worker/config.properties
rename to presto/conf/worker1/config.properties
diff --git a/presto/conf/worker/jvm.config b/presto/conf/worker1/jvm.config
similarity index 100%
rename from presto/conf/worker/jvm.config
rename to presto/conf/worker1/jvm.config
diff --git a/presto/conf/worker/log.properties b/presto/conf/worker1/log.properties
similarity index 100%
rename from presto/conf/worker/log.properties
rename to presto/conf/worker1/log.properties
diff --git a/presto/conf/worker/node.properties b/presto/conf/worker1/node.properties
similarity index 78%
rename from presto/conf/worker/node.properties
rename to presto/conf/worker1/node.properties
index 51c198c..31e6879 100644
--- a/presto/conf/worker/node.properties
+++ b/presto/conf/worker1/node.properties
@@ -1,3 +1,3 @@
 node.environment=production
-node.id=worker
+node.id=worker1
 node.data-dir=/var/presto/data
diff --git a/presto/docker-compose.yml b/presto/docker-compose.yml
index 740dda4..259a2f9 100644
--- a/presto/docker-compose.yml
+++ b/presto/docker-compose.yml
@@ -7,13 +7,13 @@ coordinator:
     - ./data/coordinator:/var/lib/presto
   restart: always
 
-worker:
+worker1:
   image: vimagick/presto
   ports:
-    - "8081:8081"
+    - "8081:8080"
   volumes:
-    - ./conf/worker:/opt/presto/etc
-    - ./data/worker:/var/lib/presto
+    - ./conf/worker1:/opt/presto/etc
+    - ./data/worker1:/var/lib/presto
   links:
     - coordinator
   restart: always