[incubator-skywalking] branch remote-host updated: Docker issues (#2243)

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch remote-host
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git


The following commit(s) were added to refs/heads/remote-host by this push:
     new a17a780  Docker issues (#2243)
     new 51f3092  Merge branch 'master' into remote-host
a17a780 is described below

commit a17a7800b47c5c6ef23ebc233f70c329e1d600ea
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Wed Feb 13 13:33:32 2019 +0800

    Docker issues (#2243)
    
    * fix no language attr value in mesh
    
    * Fixed docker issues
---
 docker/Makefile           | 6 +++---
 docker/docker-compose.yml | 2 +-
 docker/oap/Dockerfile     | 4 ++--
 docker/ui/Dockerfile      | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker/Makefile b/docker/Makefile
index 7ee7bb32..38a6847 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -14,14 +14,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-oap:
+oap: 
 	cd oap; \
-	cp ../../dist/apache-skywalking-apm-incubating-bin.tar.gz ./ ; \
+	cp ../../dist/apache-skywalking-apm-incubating-bin.tar.gz ./skywalking.tar.gz ; \
 	docker build -t skywalking/oap:latest .
 
 ui:
 	cd ui; \
-	cp ../../dist/apache-skywalking-apm-incubating-bin.tar.gz ./ ; \
+	cp ../../dist/apache-skywalking-apm-incubating-bin.tar.gz ./skywalking.tar.gz ; \
 	docker build -t skywalking/ui:latest .
 	
 build: oap ui
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 927cd4c..4c6da78 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -37,7 +37,7 @@ services:
       - 11800:11800
       - 12800:12800
     volumes:
-      - ./config:/apache-skywalking-apm-incubating/config:ro
+      - ./config:/skywalking/config:ro
   ui:
     image: skywalking/ui
     container_name: ui
diff --git a/docker/oap/Dockerfile b/docker/oap/Dockerfile
index b89b423..6533930 100644
--- a/docker/oap/Dockerfile
+++ b/docker/oap/Dockerfile
@@ -16,8 +16,8 @@
 
 FROM openjdk:8-jre-alpine
 
-ENV DIST_NAME=apache-skywalking-apm-incubating-bin \
-    JAVA_OPTS=" -Xms256M -Xmx512M"
+ENV DIST_NAME=skywalking \
+    JAVA_OPTS=" -Xms256M "
 
 # Install required packages
 RUN apk add --no-cache \
diff --git a/docker/ui/Dockerfile b/docker/ui/Dockerfile
index a6893d4..c399963 100644
--- a/docker/ui/Dockerfile
+++ b/docker/ui/Dockerfile
@@ -16,8 +16,8 @@
 
 FROM openjdk:8-jre-alpine
 
-ENV DIST_NAME=apache-skywalking-apm-incubating-bin \
-    JAVA_OPTS=" -Xms256M -Xmx512M"
+ENV DIST_NAME=skywalking \
+    JAVA_OPTS=" -Xms256M "
 
 # Install required packages
 RUN apk add --no-cache \