kazusa
/
skywalking
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
吴晟 Wu Sheng 2024-02-27 14:57:57 +08:00 committed by GitHub
parent eb071e49df
commit a65a6e0ff2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -20,7 +20,6 @@ SW_ROOT := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
CONTEXT ?= ${SW_ROOT}/dist CONTEXT ?= ${SW_ROOT}/dist
SKIP_TEST ?= false SKIP_TEST ?= false
DIST ?= apache-skywalking-apm-bin.tar.gz 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: init:
cd $(SW_ROOT) && git submodule update --init --recursive 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) BUILD_ARGS := $(BUILD_ARGS) --build-arg BASE_IMAGE=$(SW_OAP_BASE_IMAGE)
endif 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) %.ui: NAME = $(UI_NAME)
%.oap: NAME = $(OAP_NAME) %.oap: NAME = $(OAP_NAME)

5
docker/README.md
View File

@ -40,11 +40,6 @@ apache-skywalking-apm-bin.tar.gz
The distribution tar ball name, for example, `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` ### `HUB`
The hub of docker image. The default value is `skywalking`. The hub of docker image. The default value is `skywalking`.

6
docker/data-generator/Dockerfile
View File

@ -16,10 +16,6 @@
ARG BASE_IMAGE='eclipse-temurin:11-jre' ARG BASE_IMAGE='eclipse-temurin:11-jre'
ARG SKYWALKING_CLI_VERSION
FROM apache/skywalking-cli:$SKYWALKING_CLI_VERSION as cli
FROM $BASE_IMAGE FROM $BASE_IMAGE
ENV SKYWALKING_HOME=/skywalking ENV SKYWALKING_HOME=/skywalking
@ -43,8 +39,6 @@ RUN set -ex; \
rm -rf "agent"; \ rm -rf "agent"; \
mkdir "bin"; mkdir "bin";
COPY --from=cli /swctl ./bin
COPY log4j2.xml config/ COPY log4j2.xml config/
COPY docker-entrypoint.sh . COPY docker-entrypoint.sh .

6
docker/oap/Dockerfile
View File

@ -16,10 +16,6 @@
ARG BASE_IMAGE='eclipse-temurin:11-jre' ARG BASE_IMAGE='eclipse-temurin:11-jre'
ARG SKYWALKING_CLI_VERSION
FROM apache/skywalking-cli:$SKYWALKING_CLI_VERSION as cli
FROM $BASE_IMAGE FROM $BASE_IMAGE
ENV SKYWALKING_HOME=/skywalking ENV SKYWALKING_HOME=/skywalking
@ -43,8 +39,6 @@ RUN set -ex; \
rm -rf "agent"; \ rm -rf "agent"; \
mkdir "bin"; mkdir "bin";
COPY --from=cli /swctl ./bin
COPY log4j2.xml config/ COPY log4j2.xml config/
COPY docker-entrypoint.sh . COPY docker-entrypoint.sh .

2
docs/en/changes/changes.md
View File

@ -6,6 +6,8 @@
* Upgrade `OTEL collector` version to `0.92.0` in all e2e tests. * Upgrade `OTEL collector` version to `0.92.0` in all e2e tests.
* Switch CI macOS runner to m1. * Switch CI macOS runner to m1.
* Upgrade PostgreSQL driver to `42.4.4` to fix CVE-2024-1597. * 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 #### OAP Server