Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove CLI(swctl) from the image. #11940

Merged
merged 1 commit into from
Feb 27, 2024
Merged

Remove CLI(swctl) from the image. #11940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
5 changes: 0 additions & 5 deletions docker/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
6 changes: 0 additions & 6 deletions docker/data-generator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 .

Expand Down
6 changes: 0 additions & 6 deletions docker/oap/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 .

Expand Down
2 changes: 2 additions & 0 deletions docs/en/changes/changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading