Remove CLI(`swctl`) from the image. (#11940)

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)

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`.

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 .
 

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 .
 

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