From 24eeb5d83b59e316e6e13902af9d5f40ee1232ec Mon Sep 17 00:00:00 2001
From: Gao Hongtao <hanahmily@gmail.com>
Date: Thu, 6 Aug 2020 10:54:40 +0800
Subject: [PATCH] Add swctl to docker image for health check (#5139)

---
 docker/docker-compose.yml | 10 +++++++++-
 docker/oap/Dockerfile.oap |  5 +++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index ab30c3004a..aef45808b5 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version: '3.3'
+version: '3.5'
 services:
   elasticsearch:
     image: docker.elastic.co/elasticsearch/elasticsearch:${ES_TAG}
@@ -42,6 +42,14 @@ services:
     environment:
       SW_STORAGE: elasticsearch
       SW_STORAGE_ES_CLUSTER_NODES: elasticsearch:9200
+      SW_HEALTH_CHECKER: default
+      SW_TELEMETRY: prometheus
+    healthcheck:
+      test: ["CMD", "./bin/swctl", "ch"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 40s
   ui:
     image: skywalking/ui:${TAG}
     container_name: ui
diff --git a/docker/oap/Dockerfile.oap b/docker/oap/Dockerfile.oap
index ff94d3b9df..471415158c 100644
--- a/docker/oap/Dockerfile.oap
+++ b/docker/oap/Dockerfile.oap
@@ -16,6 +16,8 @@
 
 ARG JAVA_VERSION=8
 
+FROM apache/skywalking-base:8.1.0-es6 AS cli
+
 FROM adoptopenjdk/openjdk$JAVA_VERSION:alpine
 
 ENV JAVA_OPTS=" -Xms256M " \
@@ -31,10 +33,13 @@ RUN set -ex; \
     rm -rf "$DIST_NAME.tar.gz"; \
     rm -rf "$DIST_NAME/config/log4j2.xml"; \
     rm -rf "$DIST_NAME/bin"; rm -rf "$DIST_NAME/webapp"; rm -rf "$DIST_NAME/agent"; \
+    mkdir "$DIST_NAME/bin"; \
     mv "$DIST_NAME" skywalking;
 
 WORKDIR skywalking
 
+COPY --from=cli /skywalking/bin/swctl ./bin
+
 COPY log4j2.xml config/
 COPY docker-entrypoint.sh .
 RUN mkdir ext-config; \
-- 
GitLab