rename dir & merge port

Dockerfile

@@ -17,30 +17,32 @@ RUN set -x \
     && rm -rf /var/lib/apt/lists/* 
 
 # 2. Init HugeGraph Sever (speed up)
+ENV SERVER_VERSION 0.10.4
 RUN set -e \
     && echo "192.30.253.112 github.com\n151.101.44.249 github.global.ssl.fastly.net" >> /etc/hosts \
-    && mkdir -p /root/server \
-    && curl -L -S ${PKG_URL}/hugegraph/releases/download/v0.10.4/hugegraph-0.10.4.tar.gz -o /root/server.tar.gz \
-    && tar xzf /root/server.tar.gz --strip-components 1 -C /root/server \
+    && mkdir -p /root/hugegraph-server \
+    && curl -L -S ${PKG_URL}/hugegraph/releases/download/v${SERVER_VERSION}/hugegraph-${SERVER_VERSION}.tar.gz -o /root/server.tar.gz \
+    && tar xzf /root/server.tar.gz --strip-components 1 -C /root/hugegraph-server \
     && rm /root/server.tar.gz \
-    && cd /root/server/ \
+    && cd /root/hugegraph-server/ \
     && sed -i "s/^restserver.url.*$/restserver.url=http:\/\/0.0.0.0:8080/g" ./conf/rest-server.properties \
     && sed -n '63p' ./bin/start-hugegraph.sh | grep "&" > /dev/null && sed -i 63{s/\&$/#/g} ./bin/start-hugegraph.sh \
     && sed -n '74p' ./bin/start-hugegraph.sh | grep "exit" > /dev/null && sed -i 74{s/^/#/g} ./bin/start-hugegraph.sh \
     && ./bin/init-store.sh
 
 # 3. Prepare for HugeGraph Studio
+ENV STUDIO_VERSION 0.10.0
 RUN set -e \
     && echo "192.30.253.112 github.com\n151.101.44.249 github.global.ssl.fastly.net" >> /etc/hosts \
-    && mkdir -p /root/studio \
-    && curl -L -S ${PKG_URL}/hugegraph-studio/releases/download/v0.10.0/hugegraph-studio-0.10.0.tar.gz -o /root/studio.tar.gz \
-    && tar xzf /root/studio.tar.gz --strip-components 1 -C /root/studio \
+    && mkdir -p /root/hugegraph-studio \
+    && curl -L -S ${PKG_URL}/hugegraph-studio/releases/download/v${STUDIO_VERSION}/hugegraph-studio-${STUDIO_VERSION}.tar.gz -o /root/studio.tar.gz \
+    && tar xzf /root/studio.tar.gz --strip-components 1 -C /root/hugegraph-studio \
     && rm /root/studio.tar.gz \
-    && sed -i "s/^studio.server.host.*$/studio.server.host=0.0.0.0/g" /root/studio/conf/hugegraph-studio.properties \
-    && sed -i "s/^graph.server.host.*$/graph.server.host=0.0.0.0/g" /root/studio/conf/hugegraph-studio.properties
+    && cd /root/hugegraph-studio/ \
+    && sed -i "s/^studio.server.host.*$/studio.server.host=0.0.0.0/g" ./conf/hugegraph-studio.properties \
+    && sed -i "s/^graph.server.host.*$/graph.server.host=0.0.0.0/g" ./conf/hugegraph-studio.properties
 
-EXPOSE 8080
-EXPOSE 8088
+EXPOSE 8080 8088
 WORKDIR /root
 
-ENTRYPOINT ["./server/bin/start-hugegraph.sh"]
+ENTRYPOINT ["./hugegraph-server/bin/start-hugegraph.sh"]