You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2021/02/05 15:03:01 UTC

[skywalking-docker] branch release-refactor updated: Remove cli tgz

This is an automated email from the ASF dual-hosted git repository.

hanahmily pushed a commit to branch release-refactor
in repository https://gitbox.apache.org/repos/asf/skywalking-docker.git


The following commit(s) were added to refs/heads/release-refactor by this push:
     new c149fb3  Remove cli tgz
c149fb3 is described below

commit c149fb376dffacca8abfb46d62d67142336b3ae2
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Fri Feb 5 23:02:02 2021 +0800

    Remove cli tgz
    
    Signed-off-by: Gao Hongtao <ha...@gmail.com>
---
 base/Dockerfile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/base/Dockerfile b/base/Dockerfile
index 7f4902c..9644f2a 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -156,12 +156,10 @@ RUN set -eux; \
 	gpg --batch --verify ${SKYWALKING_CLI_ASC} ${SKYWALKING_CLI_TGZ}; \
 	tar -xvf ${SKYWALKING_CLI_TGZ}; \
     mkdir bin; \
-	mv skywalking-cli-${SKYWALKING_CLI_VERSION}-bin cli; \
-	mv cli/bin/swctl-${SKYWALKING_CLI_VERSION}-linux-amd64 bin/swctl; \
-	rm -rf cli/bin/; \
+	mv skywalking-cli-${SKYWALKING_CLI_VERSION}-bin/bin/swctl-${SKYWALKING_CLI_VERSION}-linux-amd64 bin/swctl; \
 	chmod 755 bin/*; \
-	rm skywalking-cli-bin.tgz*; \
-	rm ${SKYWALKING_CLI_TGZ}*; \
+	rm -rf ${SKYWALKING_CLI_TGZ}*; \
+	rm -rf skywalking-cli-${SKYWALKING_CLI_VERSION}-bin/; \
 	command -v gpgconf && gpgconf --kill all || :; \
 	rm -rf "$GNUPGHOME"; \
 	ls -la;\