You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2023/08/02 14:06:09 UTC
[skywalking] branch docker/alpine updated: Fix healthcheck method and fix base image in CI
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch docker/alpine
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/docker/alpine by this push:
new c28f885cbb Fix healthcheck method and fix base image in CI
c28f885cbb is described below
commit c28f885cbbab5a9a0bd15f0796afc19958a1b100
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Wed Aug 2 22:05:58 2023 +0800
Fix healthcheck method and fix base image in CI
---
.github/workflows/skywalking.yaml | 2 +-
test/e2e-v2/script/docker-compose/base-compose.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/skywalking.yaml b/.github/workflows/skywalking.yaml
index 07e139a1c2..69d2040ab9 100644
--- a/.github/workflows/skywalking.yaml
+++ b/.github/workflows/skywalking.yaml
@@ -214,7 +214,7 @@ jobs:
java-version: ${{ matrix.java-version }}
- name: Build and save docker images
env:
- SW_OAP_BASE_IMAGE: eclipse-temurin:${{ matrix.java-version }}-jre
+ SW_OAP_BASE_IMAGE: eclipse-temurin:${{ matrix.java-version }}-jre-alpine
run: |
make docker.all || make docker.all
docker save -o docker-images-skywalking-oap.tar skywalking/oap:latest
diff --git a/test/e2e-v2/script/docker-compose/base-compose.yml b/test/e2e-v2/script/docker-compose/base-compose.yml
index 1a78645d3e..2821bdb957 100644
--- a/test/e2e-v2/script/docker-compose/base-compose.yml
+++ b/test/e2e-v2/script/docker-compose/base-compose.yml
@@ -38,7 +38,7 @@ services:
SW_CONFIG_ETCD_ENDPOINTS: http://etcd:2379
SW_CLUSTER_ETCD_ENDPOINTS: http://etcd:2379
healthcheck:
- test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"]
+ test: ["CMD", "/skywalking/bin/swctl", "healthcheck"]
interval: 5s
timeout: 60s
retries: 120