This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch remove-cli in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 92d8fd8621984e69957813bb5ae8cf0bc3795eb3 Author: Wu Sheng <wu.sh...@foxmail.com> AuthorDate: Tue Feb 27 14:26:37 2024 +0800 Remove CLI(`swctl`) from the image. --- Makefile | 3 +-- docker/README.md | 5 ----- docker/data-generator/Dockerfile | 6 ------ docker/oap/Dockerfile | 6 ------ docs/en/changes/changes.md | 2 ++ 5 files changed, 3 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index 9d6dc02fcc..0c0730a166 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,6 @@ SW_ROOT := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) CONTEXT ?= ${SW_ROOT}/dist SKIP_TEST ?= false DIST ?= apache-skywalking-apm-bin.tar.gz -CLI_VERSION ?= 0.12.0 # CLI version inside OAP image should always use an Apache released artifact. init: cd $(SW_ROOT) && git submodule update --init --recursive @@ -54,7 +53,7 @@ ifneq ($(SW_OAP_BASE_IMAGE),) BUILD_ARGS := $(BUILD_ARGS) --build-arg BASE_IMAGE=$(SW_OAP_BASE_IMAGE) endif -BUILD_ARGS := $(BUILD_ARGS) --build-arg DIST=$(DIST) --build-arg SKYWALKING_CLI_VERSION=$(CLI_VERSION) +BUILD_ARGS := $(BUILD_ARGS) --build-arg DIST=$(DIST) %.ui: NAME = $(UI_NAME) %.oap: NAME = $(OAP_NAME) diff --git a/docker/README.md b/docker/README.md index 2632d2a5c6..0070b1574d 100644 --- a/docker/README.md +++ b/docker/README.md @@ -40,11 +40,6 @@ apache-skywalking-apm-bin.tar.gz The distribution tar ball name, for example, `apache-skywalking-apm-bin.tar.gz`. -### `CLI_VERSION` - -The [SkyWalking CLI](http://github.com/apache/skywalking-cli) version to be included in the OAP image, it must be an -official Apache release version. - ### `HUB` The hub of docker image. The default value is `skywalking`. diff --git a/docker/data-generator/Dockerfile b/docker/data-generator/Dockerfile index aa0d14ab40..b4072c746d 100644 --- a/docker/data-generator/Dockerfile +++ b/docker/data-generator/Dockerfile @@ -16,10 +16,6 @@ ARG BASE_IMAGE='eclipse-temurin:11-jre' -ARG SKYWALKING_CLI_VERSION - -FROM apache/skywalking-cli:$SKYWALKING_CLI_VERSION as cli - FROM $BASE_IMAGE ENV SKYWALKING_HOME=/skywalking @@ -43,8 +39,6 @@ RUN set -ex; \ rm -rf "agent"; \ mkdir "bin"; -COPY --from=cli /swctl ./bin - COPY log4j2.xml config/ COPY docker-entrypoint.sh . diff --git a/docker/oap/Dockerfile b/docker/oap/Dockerfile index aa0d14ab40..b4072c746d 100644 --- a/docker/oap/Dockerfile +++ b/docker/oap/Dockerfile @@ -16,10 +16,6 @@ ARG BASE_IMAGE='eclipse-temurin:11-jre' -ARG SKYWALKING_CLI_VERSION - -FROM apache/skywalking-cli:$SKYWALKING_CLI_VERSION as cli - FROM $BASE_IMAGE ENV SKYWALKING_HOME=/skywalking @@ -43,8 +39,6 @@ RUN set -ex; \ rm -rf "agent"; \ mkdir "bin"; -COPY --from=cli /swctl ./bin - COPY log4j2.xml config/ COPY docker-entrypoint.sh . diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index b63cb7ef03..f794e66a59 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -6,6 +6,8 @@ * Upgrade `OTEL collector` version to `0.92.0` in all e2e tests. * Switch CI macOS runner to m1. * Upgrade PostgreSQL driver to `42.4.4` to fix CVE-2024-1597. +* Remove CLI(`swctl`) from the image. +* Remove CLI_VERSION variable from Makefile build. #### OAP Server