You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2019/05/15 09:29:28 UTC
[skywalking] 03/04: Update docker-compose
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch docker/build
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit f1dfe6e6b1cc716e8840680551d92e8b6fedbaaa
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Wed May 15 16:50:40 2019 +0800
Update docker-compose
---
Makefile | 2 ++
docker/docker-compose.yml | 13 +++++++++----
docker/ui/Dockerfile.ui | 5 ++---
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index 54ed54b..acb6a85 100644
--- a/Makefile
+++ b/Makefile
@@ -91,3 +91,5 @@ $(foreach TGT,$(DOCKER_TARGETS),$(eval DOCKER_PUSH_TARGETS+=push.$(TGT)))
# Will build and push docker images.
docker.push: $(DOCKER_PUSH_TARGETS)
+
+
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 88b40f7..7b5f821 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -17,7 +17,7 @@
version: '3.3'
services:
elasticsearch:
- image: docker.elastic.co/elasticsearch/elasticsearch:6.3.2
+ image: docker.elastic.co/elasticsearch/elasticsearch:6.4.3
container_name: elasticsearch
restart: always
ports:
@@ -25,6 +25,10 @@ services:
- 9300:9300
environment:
discovery.type: single-node
+ ulimits:
+ memlock:
+ soft: -1
+ hard: -1
oap:
image: skywalking/oap
container_name: oap
@@ -36,8 +40,9 @@ services:
ports:
- 11800:11800
- 12800:12800
- volumes:
- - ./config:/skywalking/config:ro
+ environment:
+ SW_STORAGE: elasticsearch
+ SW_STORAGE_ES_CLUSTER_NODES: elasticsearch:9200
ui:
image: skywalking/ui
container_name: ui
@@ -49,4 +54,4 @@ services:
ports:
- 8080:8080
environment:
- collectorListOfServers: oap:12800
+ SW_OAP_ADDRESS: oap:12800
diff --git a/docker/ui/Dockerfile.ui b/docker/ui/Dockerfile.ui
index e1bb572..a52a148 100644
--- a/docker/ui/Dockerfile.ui
+++ b/docker/ui/Dockerfile.ui
@@ -18,9 +18,8 @@ FROM openjdk:8u181-jdk-stretch
ENV DIST_NAME=apache-skywalking-apm-bin \
JAVA_OPTS=" -Xms256M " \
- SW_OAP_ADDRESS="oap:12800" \
- SW_TIMEOUT="20000" \
- SW_ADMIN_PASSWORD="admin"
+ SW_OAP_ADDRESS="127.0.0.1:12800" \
+ SW_TIMEOUT="20000"
COPY "$DIST_NAME.tar.gz" /