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 14:44:14 UTC
[skywalking-docker] branch release-refactor created (now 9a81742)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch release-refactor
in repository https://gitbox.apache.org/repos/asf/skywalking-docker.git.
at 9a81742 Archive old artifacts
This branch includes the following new commits:
new 9a81742 Archive old artifacts
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[skywalking-docker] 01/01: Archive old artifacts
Posted by ha...@apache.org.
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
commit 9a81742efb6b9b2f87ef40220b3f4f6d1f75002d
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Fri Feb 5 22:43:20 2021 +0800
Archive old artifacts
Signed-off-by: Gao Hongtao <ha...@gmail.com>
---
{6 => archive/6}/6.0-GA/base/Dockerfile | 0
{6/6.0-beta => archive/6/6.0-GA}/compose/README.md | 0
.../6/6.0-GA}/compose/config/alarm-settings.yml | 0
.../6}/6.0-GA/compose/config/application.yml | 0
.../6.0-GA/compose/config/component-libraries.yml | 0
.../compose/config/datasource-settings.properties | 0
.../6/6.0-GA}/compose/config/log4j2.xml | 0
{6 => archive/6}/6.0-GA/compose/docker-compose.yml | 0
{6 => archive/6}/6.0-GA/oap/Dockerfile | 0
.../6/6.0-GA}/oap/docker-entrypoint.sh | 0
{6/6.4 => archive/6/6.0-GA}/oap/log4j2.xml | 0
{6 => archive/6}/6.0-GA/ui/Dockerfile | 0
.../6/6.0-GA}/ui/docker-entrypoint.sh | 0
{8/8.3.0 => archive/6/6.0-GA}/ui/logback.xml | 0
{6 => archive/6}/6.0-alpha/base/Dockerfile | 0
{6 => archive/6}/6.0-alpha/oap/Dockerfile | 0
.../6}/6.0-alpha/oap/docker-entrypoint.sh | 0
{6/6.3 => archive/6/6.0-alpha}/oap/log4j2.xml | 0
{6 => archive/6}/6.0-alpha/ui/Dockerfile | 0
{6 => archive/6}/6.0-alpha/ui/docker-entrypoint.sh | 0
{8/8.2.0 => archive/6/6.0-alpha}/ui/logback.xml | 0
{6 => archive/6}/6.0-beta/base/Dockerfile | 0
{6/6.0-GA => archive/6/6.0-beta}/compose/README.md | 0
.../6/6.0-beta}/compose/config/alarm-settings.yml | 0
.../6}/6.0-beta/compose/config/application.yml | 0
.../compose/config/component-libraries.yml | 0
.../compose/config/datasource-settings.properties | 0
.../6/6.0-beta}/compose/config/log4j2.xml | 0
.../6}/6.0-beta/compose/docker-compose.yml | 0
{6 => archive/6}/6.0-beta/oap/Dockerfile | 0
.../6/6.0-beta}/oap/docker-entrypoint.sh | 0
{6/6.2 => archive/6/6.0-beta}/oap/log4j2.xml | 0
{6 => archive/6}/6.0-beta/ui/Dockerfile | 0
.../6/6.0-beta}/ui/docker-entrypoint.sh | 0
{8/8.1.0 => archive/6/6.0-beta}/ui/logback.xml | 0
{6 => archive/6}/6.1/base/Dockerfile | 0
{6 => archive/6}/6.1/compose/docker-compose.yml | 0
{6 => archive/6}/6.1/oap/Dockerfile | 0
{6 => archive/6}/6.1/oap/README.md | 0
{6 => archive/6}/6.1/oap/docker-entrypoint.sh | 0
{6 => archive/6}/6.1/oap/log4j2.xml | 0
{6 => archive/6}/6.1/ui/Dockerfile | 0
{6 => archive/6}/6.1/ui/README.md | 0
{8/8.1.0 => archive/6/6.1}/ui/docker-entrypoint.sh | 0
{8/8.0 => archive/6/6.1}/ui/logback.xml | 0
{6 => archive/6}/6.2/base/Dockerfile | 0
{6 => archive/6}/6.2/compose/docker-compose.yml | 0
{6 => archive/6}/6.2/oap/Dockerfile | 0
{6 => archive/6}/6.2/oap/README.md | 0
{6 => archive/6}/6.2/oap/docker-entrypoint.sh | 0
{6/6.0-beta => archive/6/6.2}/oap/log4j2.xml | 0
{6 => archive/6}/6.2/ui/Dockerfile | 0
{6 => archive/6}/6.2/ui/README.md | 0
{8/8.0 => archive/6/6.2}/ui/docker-entrypoint.sh | 0
{8/8.0.1 => archive/6/6.2}/ui/logback.xml | 0
{6 => archive/6}/6.3/base/Dockerfile | 0
{6 => archive/6}/6.3/compose/docker-compose.yml | 0
{6 => archive/6}/6.3/oap/Dockerfile | 0
{6 => archive/6}/6.3/oap/README.md | 0
{6/6.4 => archive/6/6.3}/oap/docker-entrypoint.sh | 0
{6/6.0-alpha => archive/6/6.3}/oap/log4j2.xml | 0
{6 => archive/6}/6.3/ui/Dockerfile | 0
{6 => archive/6}/6.3/ui/README.md | 0
{8/8.0.1 => archive/6/6.3}/ui/docker-entrypoint.sh | 0
{7/7.0 => archive/6/6.3}/ui/logback.xml | 0
{6 => archive/6}/6.4/base/Dockerfile | 0
{6 => archive/6}/6.4/compose/docker-compose.yml | 0
{6 => archive/6}/6.4/oap/Dockerfile | 0
{6 => archive/6}/6.4/oap/README.md | 0
{6/6.3 => archive/6/6.4}/oap/docker-entrypoint.sh | 0
{6/6.0-GA => archive/6/6.4}/oap/log4j2.xml | 0
{6 => archive/6}/6.4/ui/Dockerfile | 0
{6 => archive/6}/6.4/ui/README.md | 0
{7/7.0 => archive/6/6.4}/ui/docker-entrypoint.sh | 0
{6/6.6 => archive/6/6.4}/ui/logback.xml | 0
{6 => archive/6}/6.5/base/Dockerfile | 0
{6 => archive/6}/6.5/compose/docker-compose.yml | 0
{6 => archive/6}/6.5/oap/Dockerfile | 0
{6 => archive/6}/6.5/oap/README.md | 0
{6 => archive/6}/6.5/oap/docker-entrypoint.sh | 0
{8/8.3.0 => archive/6/6.5}/oap/log4j2.xml | 0
{6 => archive/6}/6.5/ui/Dockerfile | 0
{6/6.6 => archive/6/6.5}/ui/README.md | 0
{6/6.6 => archive/6/6.5}/ui/docker-entrypoint.sh | 0
{6 => archive/6}/6.5/ui/logback.xml | 0
{6 => archive/6}/6.6/base-es7/Dockerfile | 0
{6 => archive/6}/6.6/base/Dockerfile | 0
.../6}/6.6/compose-es7/docker-compose.yml | 0
{6 => archive/6}/6.6/compose/docker-compose.yml | 0
{6 => archive/6}/6.6/oap-es7/Dockerfile | 0
{6 => archive/6}/6.6/oap-es7/README.md | 0
{6 => archive/6}/6.6/oap-es7/docker-entrypoint.sh | 0
{8/8.3.0 => archive/6/6.6}/oap-es7/log4j2.xml | 0
{6 => archive/6}/6.6/oap/Dockerfile | 0
{6 => archive/6}/6.6/oap/README.md | 0
{6 => archive/6}/6.6/oap/docker-entrypoint.sh | 0
{8/8.2.0 => archive/6/6.6}/oap/log4j2.xml | 0
{6 => archive/6}/6.6/ui/Dockerfile | 0
{6/6.5 => archive/6/6.6}/ui/README.md | 0
{6/6.5 => archive/6/6.6}/ui/docker-entrypoint.sh | 0
{6/6.4 => archive/6/6.6}/ui/logback.xml | 0
{7 => archive/7}/7.0/base-es7/Dockerfile | 0
{7 => archive/7}/7.0/base/Dockerfile | 0
.../7}/7.0/compose-es7/docker-compose.yml | 0
{7 => archive/7}/7.0/compose/docker-compose.yml | 0
{7 => archive/7}/7.0/oap-es7/Dockerfile | 0
{7 => archive/7}/7.0/oap-es7/README.md | 0
{7 => archive/7}/7.0/oap-es7/docker-entrypoint.sh | 0
{8/8.2.0 => archive/7/7.0}/oap-es7/log4j2.xml | 0
{7 => archive/7}/7.0/oap/Dockerfile | 0
{7 => archive/7}/7.0/oap/README.md | 0
{7 => archive/7}/7.0/oap/docker-entrypoint.sh | 0
{8/8.1.0 => archive/7/7.0}/oap/log4j2.xml | 0
{7 => archive/7}/7.0/ui/Dockerfile | 0
{7 => archive/7}/7.0/ui/README.md | 0
{6/6.4 => archive/7/7.0}/ui/docker-entrypoint.sh | 0
{6/6.3 => archive/7/7.0}/ui/logback.xml | 0
{8 => archive/8}/8.0.1/base-es7/Dockerfile | 0
{8 => archive/8}/8.0.1/base/Dockerfile | 0
.../8}/8.0.1/compose-es7/docker-compose.yml | 0
{8 => archive/8}/8.0.1/compose/docker-compose.yml | 0
{8 => archive/8}/8.0.1/oap-es7/Dockerfile | 0
{8 => archive/8}/8.0.1/oap-es7/README.md | 0
.../8/8.0.1}/oap-es7/docker-entrypoint.sh | 0
{8/8.1.0 => archive/8/8.0.1}/oap-es7/log4j2.xml | 0
{8 => archive/8}/8.0.1/oap/Dockerfile | 0
{8 => archive/8}/8.0.1/oap/README.md | 0
.../8/8.0.1}/oap/docker-entrypoint.sh | 0
{8/8.0 => archive/8/8.0.1}/oap/log4j2.xml | 0
{8 => archive/8}/8.0.1/ui/Dockerfile | 0
{8 => archive/8}/8.0.1/ui/README.md | 0
{6/6.3 => archive/8/8.0.1}/ui/docker-entrypoint.sh | 0
{6/6.2 => archive/8/8.0.1}/ui/logback.xml | 0
{8 => archive/8}/8.0/base-es7/Dockerfile | 0
{8 => archive/8}/8.0/base/Dockerfile | 0
.../8}/8.0/compose-es7/docker-compose.yml | 0
{8 => archive/8}/8.0/compose/docker-compose.yml | 0
{8 => archive/8}/8.0/oap-es7/Dockerfile | 0
{8 => archive/8}/8.0/oap-es7/README.md | 0
{8 => archive/8}/8.0/oap-es7/docker-entrypoint.sh | 0
{8 => archive/8}/8.0/oap-es7/log4j2.xml | 0
{8 => archive/8}/8.0/oap/Dockerfile | 0
{8 => archive/8}/8.0/oap/README.md | 0
{8 => archive/8}/8.0/oap/docker-entrypoint.sh | 0
{8/8.0.1 => archive/8/8.0}/oap/log4j2.xml | 0
{8 => archive/8}/8.0/ui/Dockerfile | 0
{8 => archive/8}/8.0/ui/README.md | 0
{6/6.2 => archive/8/8.0}/ui/docker-entrypoint.sh | 0
{6/6.1 => archive/8/8.0}/ui/logback.xml | 0
{8 => archive/8}/8.1.0/base-es7/Dockerfile | 0
{8 => archive/8}/8.1.0/base/Dockerfile | 0
.../8}/8.1.0/compose-es7/docker-compose.yml | 0
{8 => archive/8}/8.1.0/compose/docker-compose.yml | 0
{8 => archive/8}/8.1.0/oap-es7/Dockerfile | 0
{8 => archive/8}/8.1.0/oap-es7/README.md | 0
.../8/8.1.0}/oap-es7/docker-entrypoint.sh | 0
{8/8.0.1 => archive/8/8.1.0}/oap-es7/log4j2.xml | 0
{8 => archive/8}/8.1.0/oap/Dockerfile | 0
{8 => archive/8}/8.1.0/oap/README.md | 0
.../8/8.1.0}/oap/docker-entrypoint.sh | 0
{7/7.0 => archive/8/8.1.0}/oap/log4j2.xml | 0
{8 => archive/8}/8.1.0/ui/Dockerfile | 0
{8 => archive/8}/8.1.0/ui/README.md | 0
{6/6.1 => archive/8/8.1.0}/ui/docker-entrypoint.sh | 0
{6/6.0-beta => archive/8/8.1.0}/ui/logback.xml | 0
{8 => archive/8}/8.2.0/base-es7/Dockerfile | 0
{8 => archive/8}/8.2.0/base/Dockerfile | 0
.../8}/8.2.0/compose-es7/docker-compose.yml | 0
{8 => archive/8}/8.2.0/compose/docker-compose.yml | 0
{8 => archive/8}/8.2.0/oap-es7/Dockerfile | 0
{8 => archive/8}/8.2.0/oap-es7/README.md | 0
.../8/8.2.0}/oap-es7/docker-entrypoint.sh | 0
{7/7.0 => archive/8/8.2.0}/oap-es7/log4j2.xml | 0
{8 => archive/8}/8.2.0/oap/Dockerfile | 0
{8 => archive/8}/8.2.0/oap/README.md | 0
.../8/8.2.0}/oap/docker-entrypoint.sh | 0
{6/6.6 => archive/8/8.2.0}/oap/log4j2.xml | 0
{8 => archive/8}/8.2.0/ui/Dockerfile | 0
{8 => archive/8}/8.2.0/ui/README.md | 0
.../8/8.2.0}/ui/docker-entrypoint.sh | 0
{6/6.0-alpha => archive/8/8.2.0}/ui/logback.xml | 0
{8 => archive/8}/8.3.0/base-es7/Dockerfile | 0
{8 => archive/8}/8.3.0/base/Dockerfile | 0
.../8}/8.3.0/compose-es7/docker-compose.yml | 0
{8 => archive/8}/8.3.0/compose/docker-compose.yml | 0
{8 => archive/8}/8.3.0/oap-es7/Dockerfile | 0
{8 => archive/8}/8.3.0/oap-es7/README.md | 0
.../8/8.3.0}/oap-es7/docker-entrypoint.sh | 0
{6/6.6 => archive/8/8.3.0}/oap-es7/log4j2.xml | 0
{8 => archive/8}/8.3.0/oap/Dockerfile | 0
{8 => archive/8}/8.3.0/oap/README.md | 0
.../8/8.3.0}/oap/docker-entrypoint.sh | 0
{6/6.5 => archive/8/8.3.0}/oap/log4j2.xml | 0
{8 => archive/8}/8.3.0/ui/Dockerfile | 0
{8 => archive/8}/8.3.0/ui/README.md | 0
.../8/8.3.0}/ui/docker-entrypoint.sh | 0
{6/6.0-GA => archive/8/8.3.0}/ui/logback.xml | 0
{8/8.3.0/base-es7 => base-es7}/Dockerfile | 0
{8/8.3.0/base => base}/Dockerfile | 108 ++++++++++++++-------
.../compose-es7 => compose-es7}/docker-compose.yml | 0
{8/8.3.0/compose => compose}/docker-compose.yml | 0
{8/8.3.0/oap-es7 => oap-es7}/Dockerfile | 0
{8/8.3.0/oap-es7 => oap-es7}/README.md | 0
{8/8.3.0/oap-es7 => oap-es7}/docker-entrypoint.sh | 0
{8/8.3.0/oap => oap-es7}/log4j2.xml | 0
{8/8.3.0/oap => oap}/Dockerfile | 0
{8/8.3.0/oap => oap}/README.md | 0
{8/8.3.0/oap => oap}/docker-entrypoint.sh | 0
{8/8.3.0/oap => oap}/log4j2.xml | 0
{8/8.3.0/ui => ui}/Dockerfile | 0
{8/8.3.0/ui => ui}/README.md | 0
{8/8.3.0/ui => ui}/docker-entrypoint.sh | 0
{8/8.3.0/ui => ui}/logback.xml | 0
213 files changed, 74 insertions(+), 34 deletions(-)
diff --git a/6/6.0-GA/base/Dockerfile b/archive/6/6.0-GA/base/Dockerfile
similarity index 100%
rename from 6/6.0-GA/base/Dockerfile
rename to archive/6/6.0-GA/base/Dockerfile
diff --git a/6/6.0-beta/compose/README.md b/archive/6/6.0-GA/compose/README.md
similarity index 100%
rename from 6/6.0-beta/compose/README.md
rename to archive/6/6.0-GA/compose/README.md
diff --git a/6/6.0-beta/compose/config/alarm-settings.yml b/archive/6/6.0-GA/compose/config/alarm-settings.yml
similarity index 100%
rename from 6/6.0-beta/compose/config/alarm-settings.yml
rename to archive/6/6.0-GA/compose/config/alarm-settings.yml
diff --git a/6/6.0-GA/compose/config/application.yml b/archive/6/6.0-GA/compose/config/application.yml
similarity index 100%
rename from 6/6.0-GA/compose/config/application.yml
rename to archive/6/6.0-GA/compose/config/application.yml
diff --git a/6/6.0-GA/compose/config/component-libraries.yml b/archive/6/6.0-GA/compose/config/component-libraries.yml
similarity index 100%
rename from 6/6.0-GA/compose/config/component-libraries.yml
rename to archive/6/6.0-GA/compose/config/component-libraries.yml
diff --git a/6/6.0-beta/compose/config/datasource-settings.properties b/archive/6/6.0-GA/compose/config/datasource-settings.properties
similarity index 100%
rename from 6/6.0-beta/compose/config/datasource-settings.properties
rename to archive/6/6.0-GA/compose/config/datasource-settings.properties
diff --git a/6/6.0-beta/compose/config/log4j2.xml b/archive/6/6.0-GA/compose/config/log4j2.xml
similarity index 100%
rename from 6/6.0-beta/compose/config/log4j2.xml
rename to archive/6/6.0-GA/compose/config/log4j2.xml
diff --git a/6/6.0-GA/compose/docker-compose.yml b/archive/6/6.0-GA/compose/docker-compose.yml
similarity index 100%
rename from 6/6.0-GA/compose/docker-compose.yml
rename to archive/6/6.0-GA/compose/docker-compose.yml
diff --git a/6/6.0-GA/oap/Dockerfile b/archive/6/6.0-GA/oap/Dockerfile
similarity index 100%
rename from 6/6.0-GA/oap/Dockerfile
rename to archive/6/6.0-GA/oap/Dockerfile
diff --git a/6/6.0-beta/oap/docker-entrypoint.sh b/archive/6/6.0-GA/oap/docker-entrypoint.sh
similarity index 100%
rename from 6/6.0-beta/oap/docker-entrypoint.sh
rename to archive/6/6.0-GA/oap/docker-entrypoint.sh
diff --git a/6/6.4/oap/log4j2.xml b/archive/6/6.0-GA/oap/log4j2.xml
similarity index 100%
rename from 6/6.4/oap/log4j2.xml
rename to archive/6/6.0-GA/oap/log4j2.xml
diff --git a/6/6.0-GA/ui/Dockerfile b/archive/6/6.0-GA/ui/Dockerfile
similarity index 100%
rename from 6/6.0-GA/ui/Dockerfile
rename to archive/6/6.0-GA/ui/Dockerfile
diff --git a/6/6.0-beta/ui/docker-entrypoint.sh b/archive/6/6.0-GA/ui/docker-entrypoint.sh
similarity index 100%
rename from 6/6.0-beta/ui/docker-entrypoint.sh
rename to archive/6/6.0-GA/ui/docker-entrypoint.sh
diff --git a/8/8.3.0/ui/logback.xml b/archive/6/6.0-GA/ui/logback.xml
similarity index 100%
copy from 8/8.3.0/ui/logback.xml
copy to archive/6/6.0-GA/ui/logback.xml
diff --git a/6/6.0-alpha/base/Dockerfile b/archive/6/6.0-alpha/base/Dockerfile
similarity index 100%
rename from 6/6.0-alpha/base/Dockerfile
rename to archive/6/6.0-alpha/base/Dockerfile
diff --git a/6/6.0-alpha/oap/Dockerfile b/archive/6/6.0-alpha/oap/Dockerfile
similarity index 100%
rename from 6/6.0-alpha/oap/Dockerfile
rename to archive/6/6.0-alpha/oap/Dockerfile
diff --git a/6/6.0-alpha/oap/docker-entrypoint.sh b/archive/6/6.0-alpha/oap/docker-entrypoint.sh
similarity index 100%
rename from 6/6.0-alpha/oap/docker-entrypoint.sh
rename to archive/6/6.0-alpha/oap/docker-entrypoint.sh
diff --git a/6/6.3/oap/log4j2.xml b/archive/6/6.0-alpha/oap/log4j2.xml
similarity index 100%
rename from 6/6.3/oap/log4j2.xml
rename to archive/6/6.0-alpha/oap/log4j2.xml
diff --git a/6/6.0-alpha/ui/Dockerfile b/archive/6/6.0-alpha/ui/Dockerfile
similarity index 100%
rename from 6/6.0-alpha/ui/Dockerfile
rename to archive/6/6.0-alpha/ui/Dockerfile
diff --git a/6/6.0-alpha/ui/docker-entrypoint.sh b/archive/6/6.0-alpha/ui/docker-entrypoint.sh
similarity index 100%
rename from 6/6.0-alpha/ui/docker-entrypoint.sh
rename to archive/6/6.0-alpha/ui/docker-entrypoint.sh
diff --git a/8/8.2.0/ui/logback.xml b/archive/6/6.0-alpha/ui/logback.xml
similarity index 100%
rename from 8/8.2.0/ui/logback.xml
rename to archive/6/6.0-alpha/ui/logback.xml
diff --git a/6/6.0-beta/base/Dockerfile b/archive/6/6.0-beta/base/Dockerfile
similarity index 100%
rename from 6/6.0-beta/base/Dockerfile
rename to archive/6/6.0-beta/base/Dockerfile
diff --git a/6/6.0-GA/compose/README.md b/archive/6/6.0-beta/compose/README.md
similarity index 100%
rename from 6/6.0-GA/compose/README.md
rename to archive/6/6.0-beta/compose/README.md
diff --git a/6/6.0-GA/compose/config/alarm-settings.yml b/archive/6/6.0-beta/compose/config/alarm-settings.yml
similarity index 100%
rename from 6/6.0-GA/compose/config/alarm-settings.yml
rename to archive/6/6.0-beta/compose/config/alarm-settings.yml
diff --git a/6/6.0-beta/compose/config/application.yml b/archive/6/6.0-beta/compose/config/application.yml
similarity index 100%
rename from 6/6.0-beta/compose/config/application.yml
rename to archive/6/6.0-beta/compose/config/application.yml
diff --git a/6/6.0-beta/compose/config/component-libraries.yml b/archive/6/6.0-beta/compose/config/component-libraries.yml
similarity index 100%
rename from 6/6.0-beta/compose/config/component-libraries.yml
rename to archive/6/6.0-beta/compose/config/component-libraries.yml
diff --git a/6/6.0-GA/compose/config/datasource-settings.properties b/archive/6/6.0-beta/compose/config/datasource-settings.properties
similarity index 100%
rename from 6/6.0-GA/compose/config/datasource-settings.properties
rename to archive/6/6.0-beta/compose/config/datasource-settings.properties
diff --git a/6/6.0-GA/compose/config/log4j2.xml b/archive/6/6.0-beta/compose/config/log4j2.xml
similarity index 100%
rename from 6/6.0-GA/compose/config/log4j2.xml
rename to archive/6/6.0-beta/compose/config/log4j2.xml
diff --git a/6/6.0-beta/compose/docker-compose.yml b/archive/6/6.0-beta/compose/docker-compose.yml
similarity index 100%
rename from 6/6.0-beta/compose/docker-compose.yml
rename to archive/6/6.0-beta/compose/docker-compose.yml
diff --git a/6/6.0-beta/oap/Dockerfile b/archive/6/6.0-beta/oap/Dockerfile
similarity index 100%
rename from 6/6.0-beta/oap/Dockerfile
rename to archive/6/6.0-beta/oap/Dockerfile
diff --git a/6/6.0-GA/oap/docker-entrypoint.sh b/archive/6/6.0-beta/oap/docker-entrypoint.sh
similarity index 100%
rename from 6/6.0-GA/oap/docker-entrypoint.sh
rename to archive/6/6.0-beta/oap/docker-entrypoint.sh
diff --git a/6/6.2/oap/log4j2.xml b/archive/6/6.0-beta/oap/log4j2.xml
similarity index 100%
rename from 6/6.2/oap/log4j2.xml
rename to archive/6/6.0-beta/oap/log4j2.xml
diff --git a/6/6.0-beta/ui/Dockerfile b/archive/6/6.0-beta/ui/Dockerfile
similarity index 100%
rename from 6/6.0-beta/ui/Dockerfile
rename to archive/6/6.0-beta/ui/Dockerfile
diff --git a/6/6.0-GA/ui/docker-entrypoint.sh b/archive/6/6.0-beta/ui/docker-entrypoint.sh
similarity index 100%
rename from 6/6.0-GA/ui/docker-entrypoint.sh
rename to archive/6/6.0-beta/ui/docker-entrypoint.sh
diff --git a/8/8.1.0/ui/logback.xml b/archive/6/6.0-beta/ui/logback.xml
similarity index 100%
rename from 8/8.1.0/ui/logback.xml
rename to archive/6/6.0-beta/ui/logback.xml
diff --git a/6/6.1/base/Dockerfile b/archive/6/6.1/base/Dockerfile
similarity index 100%
rename from 6/6.1/base/Dockerfile
rename to archive/6/6.1/base/Dockerfile
diff --git a/6/6.1/compose/docker-compose.yml b/archive/6/6.1/compose/docker-compose.yml
similarity index 100%
rename from 6/6.1/compose/docker-compose.yml
rename to archive/6/6.1/compose/docker-compose.yml
diff --git a/6/6.1/oap/Dockerfile b/archive/6/6.1/oap/Dockerfile
similarity index 100%
rename from 6/6.1/oap/Dockerfile
rename to archive/6/6.1/oap/Dockerfile
diff --git a/6/6.1/oap/README.md b/archive/6/6.1/oap/README.md
similarity index 100%
rename from 6/6.1/oap/README.md
rename to archive/6/6.1/oap/README.md
diff --git a/6/6.1/oap/docker-entrypoint.sh b/archive/6/6.1/oap/docker-entrypoint.sh
similarity index 100%
rename from 6/6.1/oap/docker-entrypoint.sh
rename to archive/6/6.1/oap/docker-entrypoint.sh
diff --git a/6/6.1/oap/log4j2.xml b/archive/6/6.1/oap/log4j2.xml
similarity index 100%
rename from 6/6.1/oap/log4j2.xml
rename to archive/6/6.1/oap/log4j2.xml
diff --git a/6/6.1/ui/Dockerfile b/archive/6/6.1/ui/Dockerfile
similarity index 100%
rename from 6/6.1/ui/Dockerfile
rename to archive/6/6.1/ui/Dockerfile
diff --git a/6/6.1/ui/README.md b/archive/6/6.1/ui/README.md
similarity index 100%
rename from 6/6.1/ui/README.md
rename to archive/6/6.1/ui/README.md
diff --git a/8/8.1.0/ui/docker-entrypoint.sh b/archive/6/6.1/ui/docker-entrypoint.sh
similarity index 100%
rename from 8/8.1.0/ui/docker-entrypoint.sh
rename to archive/6/6.1/ui/docker-entrypoint.sh
diff --git a/8/8.0/ui/logback.xml b/archive/6/6.1/ui/logback.xml
similarity index 100%
rename from 8/8.0/ui/logback.xml
rename to archive/6/6.1/ui/logback.xml
diff --git a/6/6.2/base/Dockerfile b/archive/6/6.2/base/Dockerfile
similarity index 100%
rename from 6/6.2/base/Dockerfile
rename to archive/6/6.2/base/Dockerfile
diff --git a/6/6.2/compose/docker-compose.yml b/archive/6/6.2/compose/docker-compose.yml
similarity index 100%
rename from 6/6.2/compose/docker-compose.yml
rename to archive/6/6.2/compose/docker-compose.yml
diff --git a/6/6.2/oap/Dockerfile b/archive/6/6.2/oap/Dockerfile
similarity index 100%
rename from 6/6.2/oap/Dockerfile
rename to archive/6/6.2/oap/Dockerfile
diff --git a/6/6.2/oap/README.md b/archive/6/6.2/oap/README.md
similarity index 100%
rename from 6/6.2/oap/README.md
rename to archive/6/6.2/oap/README.md
diff --git a/6/6.2/oap/docker-entrypoint.sh b/archive/6/6.2/oap/docker-entrypoint.sh
similarity index 100%
rename from 6/6.2/oap/docker-entrypoint.sh
rename to archive/6/6.2/oap/docker-entrypoint.sh
diff --git a/6/6.0-beta/oap/log4j2.xml b/archive/6/6.2/oap/log4j2.xml
similarity index 100%
rename from 6/6.0-beta/oap/log4j2.xml
rename to archive/6/6.2/oap/log4j2.xml
diff --git a/6/6.2/ui/Dockerfile b/archive/6/6.2/ui/Dockerfile
similarity index 100%
rename from 6/6.2/ui/Dockerfile
rename to archive/6/6.2/ui/Dockerfile
diff --git a/6/6.2/ui/README.md b/archive/6/6.2/ui/README.md
similarity index 100%
rename from 6/6.2/ui/README.md
rename to archive/6/6.2/ui/README.md
diff --git a/8/8.0/ui/docker-entrypoint.sh b/archive/6/6.2/ui/docker-entrypoint.sh
similarity index 100%
rename from 8/8.0/ui/docker-entrypoint.sh
rename to archive/6/6.2/ui/docker-entrypoint.sh
diff --git a/8/8.0.1/ui/logback.xml b/archive/6/6.2/ui/logback.xml
similarity index 100%
rename from 8/8.0.1/ui/logback.xml
rename to archive/6/6.2/ui/logback.xml
diff --git a/6/6.3/base/Dockerfile b/archive/6/6.3/base/Dockerfile
similarity index 100%
rename from 6/6.3/base/Dockerfile
rename to archive/6/6.3/base/Dockerfile
diff --git a/6/6.3/compose/docker-compose.yml b/archive/6/6.3/compose/docker-compose.yml
similarity index 100%
rename from 6/6.3/compose/docker-compose.yml
rename to archive/6/6.3/compose/docker-compose.yml
diff --git a/6/6.3/oap/Dockerfile b/archive/6/6.3/oap/Dockerfile
similarity index 100%
rename from 6/6.3/oap/Dockerfile
rename to archive/6/6.3/oap/Dockerfile
diff --git a/6/6.3/oap/README.md b/archive/6/6.3/oap/README.md
similarity index 100%
rename from 6/6.3/oap/README.md
rename to archive/6/6.3/oap/README.md
diff --git a/6/6.4/oap/docker-entrypoint.sh b/archive/6/6.3/oap/docker-entrypoint.sh
similarity index 100%
rename from 6/6.4/oap/docker-entrypoint.sh
rename to archive/6/6.3/oap/docker-entrypoint.sh
diff --git a/6/6.0-alpha/oap/log4j2.xml b/archive/6/6.3/oap/log4j2.xml
similarity index 100%
rename from 6/6.0-alpha/oap/log4j2.xml
rename to archive/6/6.3/oap/log4j2.xml
diff --git a/6/6.3/ui/Dockerfile b/archive/6/6.3/ui/Dockerfile
similarity index 100%
rename from 6/6.3/ui/Dockerfile
rename to archive/6/6.3/ui/Dockerfile
diff --git a/6/6.3/ui/README.md b/archive/6/6.3/ui/README.md
similarity index 100%
rename from 6/6.3/ui/README.md
rename to archive/6/6.3/ui/README.md
diff --git a/8/8.0.1/ui/docker-entrypoint.sh b/archive/6/6.3/ui/docker-entrypoint.sh
similarity index 100%
rename from 8/8.0.1/ui/docker-entrypoint.sh
rename to archive/6/6.3/ui/docker-entrypoint.sh
diff --git a/7/7.0/ui/logback.xml b/archive/6/6.3/ui/logback.xml
similarity index 100%
rename from 7/7.0/ui/logback.xml
rename to archive/6/6.3/ui/logback.xml
diff --git a/6/6.4/base/Dockerfile b/archive/6/6.4/base/Dockerfile
similarity index 100%
rename from 6/6.4/base/Dockerfile
rename to archive/6/6.4/base/Dockerfile
diff --git a/6/6.4/compose/docker-compose.yml b/archive/6/6.4/compose/docker-compose.yml
similarity index 100%
rename from 6/6.4/compose/docker-compose.yml
rename to archive/6/6.4/compose/docker-compose.yml
diff --git a/6/6.4/oap/Dockerfile b/archive/6/6.4/oap/Dockerfile
similarity index 100%
rename from 6/6.4/oap/Dockerfile
rename to archive/6/6.4/oap/Dockerfile
diff --git a/6/6.4/oap/README.md b/archive/6/6.4/oap/README.md
similarity index 100%
rename from 6/6.4/oap/README.md
rename to archive/6/6.4/oap/README.md
diff --git a/6/6.3/oap/docker-entrypoint.sh b/archive/6/6.4/oap/docker-entrypoint.sh
similarity index 100%
rename from 6/6.3/oap/docker-entrypoint.sh
rename to archive/6/6.4/oap/docker-entrypoint.sh
diff --git a/6/6.0-GA/oap/log4j2.xml b/archive/6/6.4/oap/log4j2.xml
similarity index 100%
rename from 6/6.0-GA/oap/log4j2.xml
rename to archive/6/6.4/oap/log4j2.xml
diff --git a/6/6.4/ui/Dockerfile b/archive/6/6.4/ui/Dockerfile
similarity index 100%
rename from 6/6.4/ui/Dockerfile
rename to archive/6/6.4/ui/Dockerfile
diff --git a/6/6.4/ui/README.md b/archive/6/6.4/ui/README.md
similarity index 100%
rename from 6/6.4/ui/README.md
rename to archive/6/6.4/ui/README.md
diff --git a/7/7.0/ui/docker-entrypoint.sh b/archive/6/6.4/ui/docker-entrypoint.sh
similarity index 100%
rename from 7/7.0/ui/docker-entrypoint.sh
rename to archive/6/6.4/ui/docker-entrypoint.sh
diff --git a/6/6.6/ui/logback.xml b/archive/6/6.4/ui/logback.xml
similarity index 100%
rename from 6/6.6/ui/logback.xml
rename to archive/6/6.4/ui/logback.xml
diff --git a/6/6.5/base/Dockerfile b/archive/6/6.5/base/Dockerfile
similarity index 100%
rename from 6/6.5/base/Dockerfile
rename to archive/6/6.5/base/Dockerfile
diff --git a/6/6.5/compose/docker-compose.yml b/archive/6/6.5/compose/docker-compose.yml
similarity index 100%
rename from 6/6.5/compose/docker-compose.yml
rename to archive/6/6.5/compose/docker-compose.yml
diff --git a/6/6.5/oap/Dockerfile b/archive/6/6.5/oap/Dockerfile
similarity index 100%
rename from 6/6.5/oap/Dockerfile
rename to archive/6/6.5/oap/Dockerfile
diff --git a/6/6.5/oap/README.md b/archive/6/6.5/oap/README.md
similarity index 100%
rename from 6/6.5/oap/README.md
rename to archive/6/6.5/oap/README.md
diff --git a/6/6.5/oap/docker-entrypoint.sh b/archive/6/6.5/oap/docker-entrypoint.sh
similarity index 100%
rename from 6/6.5/oap/docker-entrypoint.sh
rename to archive/6/6.5/oap/docker-entrypoint.sh
diff --git a/8/8.3.0/oap/log4j2.xml b/archive/6/6.5/oap/log4j2.xml
similarity index 100%
copy from 8/8.3.0/oap/log4j2.xml
copy to archive/6/6.5/oap/log4j2.xml
diff --git a/6/6.5/ui/Dockerfile b/archive/6/6.5/ui/Dockerfile
similarity index 100%
rename from 6/6.5/ui/Dockerfile
rename to archive/6/6.5/ui/Dockerfile
diff --git a/6/6.6/ui/README.md b/archive/6/6.5/ui/README.md
similarity index 100%
rename from 6/6.6/ui/README.md
rename to archive/6/6.5/ui/README.md
diff --git a/6/6.6/ui/docker-entrypoint.sh b/archive/6/6.5/ui/docker-entrypoint.sh
similarity index 100%
rename from 6/6.6/ui/docker-entrypoint.sh
rename to archive/6/6.5/ui/docker-entrypoint.sh
diff --git a/6/6.5/ui/logback.xml b/archive/6/6.5/ui/logback.xml
similarity index 100%
rename from 6/6.5/ui/logback.xml
rename to archive/6/6.5/ui/logback.xml
diff --git a/6/6.6/base-es7/Dockerfile b/archive/6/6.6/base-es7/Dockerfile
similarity index 100%
rename from 6/6.6/base-es7/Dockerfile
rename to archive/6/6.6/base-es7/Dockerfile
diff --git a/6/6.6/base/Dockerfile b/archive/6/6.6/base/Dockerfile
similarity index 100%
rename from 6/6.6/base/Dockerfile
rename to archive/6/6.6/base/Dockerfile
diff --git a/6/6.6/compose-es7/docker-compose.yml b/archive/6/6.6/compose-es7/docker-compose.yml
similarity index 100%
rename from 6/6.6/compose-es7/docker-compose.yml
rename to archive/6/6.6/compose-es7/docker-compose.yml
diff --git a/6/6.6/compose/docker-compose.yml b/archive/6/6.6/compose/docker-compose.yml
similarity index 100%
rename from 6/6.6/compose/docker-compose.yml
rename to archive/6/6.6/compose/docker-compose.yml
diff --git a/6/6.6/oap-es7/Dockerfile b/archive/6/6.6/oap-es7/Dockerfile
similarity index 100%
rename from 6/6.6/oap-es7/Dockerfile
rename to archive/6/6.6/oap-es7/Dockerfile
diff --git a/6/6.6/oap-es7/README.md b/archive/6/6.6/oap-es7/README.md
similarity index 100%
rename from 6/6.6/oap-es7/README.md
rename to archive/6/6.6/oap-es7/README.md
diff --git a/6/6.6/oap-es7/docker-entrypoint.sh b/archive/6/6.6/oap-es7/docker-entrypoint.sh
similarity index 100%
rename from 6/6.6/oap-es7/docker-entrypoint.sh
rename to archive/6/6.6/oap-es7/docker-entrypoint.sh
diff --git a/8/8.3.0/oap-es7/log4j2.xml b/archive/6/6.6/oap-es7/log4j2.xml
similarity index 100%
rename from 8/8.3.0/oap-es7/log4j2.xml
rename to archive/6/6.6/oap-es7/log4j2.xml
diff --git a/6/6.6/oap/Dockerfile b/archive/6/6.6/oap/Dockerfile
similarity index 100%
rename from 6/6.6/oap/Dockerfile
rename to archive/6/6.6/oap/Dockerfile
diff --git a/6/6.6/oap/README.md b/archive/6/6.6/oap/README.md
similarity index 100%
rename from 6/6.6/oap/README.md
rename to archive/6/6.6/oap/README.md
diff --git a/6/6.6/oap/docker-entrypoint.sh b/archive/6/6.6/oap/docker-entrypoint.sh
similarity index 100%
rename from 6/6.6/oap/docker-entrypoint.sh
rename to archive/6/6.6/oap/docker-entrypoint.sh
diff --git a/8/8.2.0/oap/log4j2.xml b/archive/6/6.6/oap/log4j2.xml
similarity index 100%
rename from 8/8.2.0/oap/log4j2.xml
rename to archive/6/6.6/oap/log4j2.xml
diff --git a/6/6.6/ui/Dockerfile b/archive/6/6.6/ui/Dockerfile
similarity index 100%
rename from 6/6.6/ui/Dockerfile
rename to archive/6/6.6/ui/Dockerfile
diff --git a/6/6.5/ui/README.md b/archive/6/6.6/ui/README.md
similarity index 100%
rename from 6/6.5/ui/README.md
rename to archive/6/6.6/ui/README.md
diff --git a/6/6.5/ui/docker-entrypoint.sh b/archive/6/6.6/ui/docker-entrypoint.sh
similarity index 100%
rename from 6/6.5/ui/docker-entrypoint.sh
rename to archive/6/6.6/ui/docker-entrypoint.sh
diff --git a/6/6.4/ui/logback.xml b/archive/6/6.6/ui/logback.xml
similarity index 100%
rename from 6/6.4/ui/logback.xml
rename to archive/6/6.6/ui/logback.xml
diff --git a/7/7.0/base-es7/Dockerfile b/archive/7/7.0/base-es7/Dockerfile
similarity index 100%
rename from 7/7.0/base-es7/Dockerfile
rename to archive/7/7.0/base-es7/Dockerfile
diff --git a/7/7.0/base/Dockerfile b/archive/7/7.0/base/Dockerfile
similarity index 100%
rename from 7/7.0/base/Dockerfile
rename to archive/7/7.0/base/Dockerfile
diff --git a/7/7.0/compose-es7/docker-compose.yml b/archive/7/7.0/compose-es7/docker-compose.yml
similarity index 100%
rename from 7/7.0/compose-es7/docker-compose.yml
rename to archive/7/7.0/compose-es7/docker-compose.yml
diff --git a/7/7.0/compose/docker-compose.yml b/archive/7/7.0/compose/docker-compose.yml
similarity index 100%
rename from 7/7.0/compose/docker-compose.yml
rename to archive/7/7.0/compose/docker-compose.yml
diff --git a/7/7.0/oap-es7/Dockerfile b/archive/7/7.0/oap-es7/Dockerfile
similarity index 100%
rename from 7/7.0/oap-es7/Dockerfile
rename to archive/7/7.0/oap-es7/Dockerfile
diff --git a/7/7.0/oap-es7/README.md b/archive/7/7.0/oap-es7/README.md
similarity index 100%
rename from 7/7.0/oap-es7/README.md
rename to archive/7/7.0/oap-es7/README.md
diff --git a/7/7.0/oap-es7/docker-entrypoint.sh b/archive/7/7.0/oap-es7/docker-entrypoint.sh
similarity index 100%
rename from 7/7.0/oap-es7/docker-entrypoint.sh
rename to archive/7/7.0/oap-es7/docker-entrypoint.sh
diff --git a/8/8.2.0/oap-es7/log4j2.xml b/archive/7/7.0/oap-es7/log4j2.xml
similarity index 100%
rename from 8/8.2.0/oap-es7/log4j2.xml
rename to archive/7/7.0/oap-es7/log4j2.xml
diff --git a/7/7.0/oap/Dockerfile b/archive/7/7.0/oap/Dockerfile
similarity index 100%
rename from 7/7.0/oap/Dockerfile
rename to archive/7/7.0/oap/Dockerfile
diff --git a/7/7.0/oap/README.md b/archive/7/7.0/oap/README.md
similarity index 100%
rename from 7/7.0/oap/README.md
rename to archive/7/7.0/oap/README.md
diff --git a/7/7.0/oap/docker-entrypoint.sh b/archive/7/7.0/oap/docker-entrypoint.sh
similarity index 100%
rename from 7/7.0/oap/docker-entrypoint.sh
rename to archive/7/7.0/oap/docker-entrypoint.sh
diff --git a/8/8.1.0/oap/log4j2.xml b/archive/7/7.0/oap/log4j2.xml
similarity index 100%
rename from 8/8.1.0/oap/log4j2.xml
rename to archive/7/7.0/oap/log4j2.xml
diff --git a/7/7.0/ui/Dockerfile b/archive/7/7.0/ui/Dockerfile
similarity index 100%
rename from 7/7.0/ui/Dockerfile
rename to archive/7/7.0/ui/Dockerfile
diff --git a/7/7.0/ui/README.md b/archive/7/7.0/ui/README.md
similarity index 100%
rename from 7/7.0/ui/README.md
rename to archive/7/7.0/ui/README.md
diff --git a/6/6.4/ui/docker-entrypoint.sh b/archive/7/7.0/ui/docker-entrypoint.sh
similarity index 100%
rename from 6/6.4/ui/docker-entrypoint.sh
rename to archive/7/7.0/ui/docker-entrypoint.sh
diff --git a/6/6.3/ui/logback.xml b/archive/7/7.0/ui/logback.xml
similarity index 100%
rename from 6/6.3/ui/logback.xml
rename to archive/7/7.0/ui/logback.xml
diff --git a/8/8.0.1/base-es7/Dockerfile b/archive/8/8.0.1/base-es7/Dockerfile
similarity index 100%
rename from 8/8.0.1/base-es7/Dockerfile
rename to archive/8/8.0.1/base-es7/Dockerfile
diff --git a/8/8.0.1/base/Dockerfile b/archive/8/8.0.1/base/Dockerfile
similarity index 100%
rename from 8/8.0.1/base/Dockerfile
rename to archive/8/8.0.1/base/Dockerfile
diff --git a/8/8.0.1/compose-es7/docker-compose.yml b/archive/8/8.0.1/compose-es7/docker-compose.yml
similarity index 100%
rename from 8/8.0.1/compose-es7/docker-compose.yml
rename to archive/8/8.0.1/compose-es7/docker-compose.yml
diff --git a/8/8.0.1/compose/docker-compose.yml b/archive/8/8.0.1/compose/docker-compose.yml
similarity index 100%
rename from 8/8.0.1/compose/docker-compose.yml
rename to archive/8/8.0.1/compose/docker-compose.yml
diff --git a/8/8.0.1/oap-es7/Dockerfile b/archive/8/8.0.1/oap-es7/Dockerfile
similarity index 100%
rename from 8/8.0.1/oap-es7/Dockerfile
rename to archive/8/8.0.1/oap-es7/Dockerfile
diff --git a/8/8.0.1/oap-es7/README.md b/archive/8/8.0.1/oap-es7/README.md
similarity index 100%
rename from 8/8.0.1/oap-es7/README.md
rename to archive/8/8.0.1/oap-es7/README.md
diff --git a/8/8.1.0/oap-es7/docker-entrypoint.sh b/archive/8/8.0.1/oap-es7/docker-entrypoint.sh
similarity index 100%
rename from 8/8.1.0/oap-es7/docker-entrypoint.sh
rename to archive/8/8.0.1/oap-es7/docker-entrypoint.sh
diff --git a/8/8.1.0/oap-es7/log4j2.xml b/archive/8/8.0.1/oap-es7/log4j2.xml
similarity index 100%
rename from 8/8.1.0/oap-es7/log4j2.xml
rename to archive/8/8.0.1/oap-es7/log4j2.xml
diff --git a/8/8.0.1/oap/Dockerfile b/archive/8/8.0.1/oap/Dockerfile
similarity index 100%
rename from 8/8.0.1/oap/Dockerfile
rename to archive/8/8.0.1/oap/Dockerfile
diff --git a/8/8.0.1/oap/README.md b/archive/8/8.0.1/oap/README.md
similarity index 100%
rename from 8/8.0.1/oap/README.md
rename to archive/8/8.0.1/oap/README.md
diff --git a/8/8.1.0/oap/docker-entrypoint.sh b/archive/8/8.0.1/oap/docker-entrypoint.sh
similarity index 100%
rename from 8/8.1.0/oap/docker-entrypoint.sh
rename to archive/8/8.0.1/oap/docker-entrypoint.sh
diff --git a/8/8.0/oap/log4j2.xml b/archive/8/8.0.1/oap/log4j2.xml
similarity index 100%
rename from 8/8.0/oap/log4j2.xml
rename to archive/8/8.0.1/oap/log4j2.xml
diff --git a/8/8.0.1/ui/Dockerfile b/archive/8/8.0.1/ui/Dockerfile
similarity index 100%
rename from 8/8.0.1/ui/Dockerfile
rename to archive/8/8.0.1/ui/Dockerfile
diff --git a/8/8.0.1/ui/README.md b/archive/8/8.0.1/ui/README.md
similarity index 100%
rename from 8/8.0.1/ui/README.md
rename to archive/8/8.0.1/ui/README.md
diff --git a/6/6.3/ui/docker-entrypoint.sh b/archive/8/8.0.1/ui/docker-entrypoint.sh
similarity index 100%
rename from 6/6.3/ui/docker-entrypoint.sh
rename to archive/8/8.0.1/ui/docker-entrypoint.sh
diff --git a/6/6.2/ui/logback.xml b/archive/8/8.0.1/ui/logback.xml
similarity index 100%
rename from 6/6.2/ui/logback.xml
rename to archive/8/8.0.1/ui/logback.xml
diff --git a/8/8.0/base-es7/Dockerfile b/archive/8/8.0/base-es7/Dockerfile
similarity index 100%
rename from 8/8.0/base-es7/Dockerfile
rename to archive/8/8.0/base-es7/Dockerfile
diff --git a/8/8.0/base/Dockerfile b/archive/8/8.0/base/Dockerfile
similarity index 100%
rename from 8/8.0/base/Dockerfile
rename to archive/8/8.0/base/Dockerfile
diff --git a/8/8.0/compose-es7/docker-compose.yml b/archive/8/8.0/compose-es7/docker-compose.yml
similarity index 100%
rename from 8/8.0/compose-es7/docker-compose.yml
rename to archive/8/8.0/compose-es7/docker-compose.yml
diff --git a/8/8.0/compose/docker-compose.yml b/archive/8/8.0/compose/docker-compose.yml
similarity index 100%
rename from 8/8.0/compose/docker-compose.yml
rename to archive/8/8.0/compose/docker-compose.yml
diff --git a/8/8.0/oap-es7/Dockerfile b/archive/8/8.0/oap-es7/Dockerfile
similarity index 100%
rename from 8/8.0/oap-es7/Dockerfile
rename to archive/8/8.0/oap-es7/Dockerfile
diff --git a/8/8.0/oap-es7/README.md b/archive/8/8.0/oap-es7/README.md
similarity index 100%
rename from 8/8.0/oap-es7/README.md
rename to archive/8/8.0/oap-es7/README.md
diff --git a/8/8.0/oap-es7/docker-entrypoint.sh b/archive/8/8.0/oap-es7/docker-entrypoint.sh
similarity index 100%
rename from 8/8.0/oap-es7/docker-entrypoint.sh
rename to archive/8/8.0/oap-es7/docker-entrypoint.sh
diff --git a/8/8.0/oap-es7/log4j2.xml b/archive/8/8.0/oap-es7/log4j2.xml
similarity index 100%
rename from 8/8.0/oap-es7/log4j2.xml
rename to archive/8/8.0/oap-es7/log4j2.xml
diff --git a/8/8.0/oap/Dockerfile b/archive/8/8.0/oap/Dockerfile
similarity index 100%
rename from 8/8.0/oap/Dockerfile
rename to archive/8/8.0/oap/Dockerfile
diff --git a/8/8.0/oap/README.md b/archive/8/8.0/oap/README.md
similarity index 100%
rename from 8/8.0/oap/README.md
rename to archive/8/8.0/oap/README.md
diff --git a/8/8.0/oap/docker-entrypoint.sh b/archive/8/8.0/oap/docker-entrypoint.sh
similarity index 100%
rename from 8/8.0/oap/docker-entrypoint.sh
rename to archive/8/8.0/oap/docker-entrypoint.sh
diff --git a/8/8.0.1/oap/log4j2.xml b/archive/8/8.0/oap/log4j2.xml
similarity index 100%
rename from 8/8.0.1/oap/log4j2.xml
rename to archive/8/8.0/oap/log4j2.xml
diff --git a/8/8.0/ui/Dockerfile b/archive/8/8.0/ui/Dockerfile
similarity index 100%
rename from 8/8.0/ui/Dockerfile
rename to archive/8/8.0/ui/Dockerfile
diff --git a/8/8.0/ui/README.md b/archive/8/8.0/ui/README.md
similarity index 100%
rename from 8/8.0/ui/README.md
rename to archive/8/8.0/ui/README.md
diff --git a/6/6.2/ui/docker-entrypoint.sh b/archive/8/8.0/ui/docker-entrypoint.sh
similarity index 100%
rename from 6/6.2/ui/docker-entrypoint.sh
rename to archive/8/8.0/ui/docker-entrypoint.sh
diff --git a/6/6.1/ui/logback.xml b/archive/8/8.0/ui/logback.xml
similarity index 100%
rename from 6/6.1/ui/logback.xml
rename to archive/8/8.0/ui/logback.xml
diff --git a/8/8.1.0/base-es7/Dockerfile b/archive/8/8.1.0/base-es7/Dockerfile
similarity index 100%
rename from 8/8.1.0/base-es7/Dockerfile
rename to archive/8/8.1.0/base-es7/Dockerfile
diff --git a/8/8.1.0/base/Dockerfile b/archive/8/8.1.0/base/Dockerfile
similarity index 100%
rename from 8/8.1.0/base/Dockerfile
rename to archive/8/8.1.0/base/Dockerfile
diff --git a/8/8.1.0/compose-es7/docker-compose.yml b/archive/8/8.1.0/compose-es7/docker-compose.yml
similarity index 100%
rename from 8/8.1.0/compose-es7/docker-compose.yml
rename to archive/8/8.1.0/compose-es7/docker-compose.yml
diff --git a/8/8.1.0/compose/docker-compose.yml b/archive/8/8.1.0/compose/docker-compose.yml
similarity index 100%
rename from 8/8.1.0/compose/docker-compose.yml
rename to archive/8/8.1.0/compose/docker-compose.yml
diff --git a/8/8.1.0/oap-es7/Dockerfile b/archive/8/8.1.0/oap-es7/Dockerfile
similarity index 100%
rename from 8/8.1.0/oap-es7/Dockerfile
rename to archive/8/8.1.0/oap-es7/Dockerfile
diff --git a/8/8.1.0/oap-es7/README.md b/archive/8/8.1.0/oap-es7/README.md
similarity index 100%
rename from 8/8.1.0/oap-es7/README.md
rename to archive/8/8.1.0/oap-es7/README.md
diff --git a/8/8.0.1/oap-es7/docker-entrypoint.sh b/archive/8/8.1.0/oap-es7/docker-entrypoint.sh
similarity index 100%
rename from 8/8.0.1/oap-es7/docker-entrypoint.sh
rename to archive/8/8.1.0/oap-es7/docker-entrypoint.sh
diff --git a/8/8.0.1/oap-es7/log4j2.xml b/archive/8/8.1.0/oap-es7/log4j2.xml
similarity index 100%
rename from 8/8.0.1/oap-es7/log4j2.xml
rename to archive/8/8.1.0/oap-es7/log4j2.xml
diff --git a/8/8.1.0/oap/Dockerfile b/archive/8/8.1.0/oap/Dockerfile
similarity index 100%
rename from 8/8.1.0/oap/Dockerfile
rename to archive/8/8.1.0/oap/Dockerfile
diff --git a/8/8.1.0/oap/README.md b/archive/8/8.1.0/oap/README.md
similarity index 100%
rename from 8/8.1.0/oap/README.md
rename to archive/8/8.1.0/oap/README.md
diff --git a/8/8.0.1/oap/docker-entrypoint.sh b/archive/8/8.1.0/oap/docker-entrypoint.sh
similarity index 100%
rename from 8/8.0.1/oap/docker-entrypoint.sh
rename to archive/8/8.1.0/oap/docker-entrypoint.sh
diff --git a/7/7.0/oap/log4j2.xml b/archive/8/8.1.0/oap/log4j2.xml
similarity index 100%
rename from 7/7.0/oap/log4j2.xml
rename to archive/8/8.1.0/oap/log4j2.xml
diff --git a/8/8.1.0/ui/Dockerfile b/archive/8/8.1.0/ui/Dockerfile
similarity index 100%
rename from 8/8.1.0/ui/Dockerfile
rename to archive/8/8.1.0/ui/Dockerfile
diff --git a/8/8.1.0/ui/README.md b/archive/8/8.1.0/ui/README.md
similarity index 100%
rename from 8/8.1.0/ui/README.md
rename to archive/8/8.1.0/ui/README.md
diff --git a/6/6.1/ui/docker-entrypoint.sh b/archive/8/8.1.0/ui/docker-entrypoint.sh
similarity index 100%
rename from 6/6.1/ui/docker-entrypoint.sh
rename to archive/8/8.1.0/ui/docker-entrypoint.sh
diff --git a/6/6.0-beta/ui/logback.xml b/archive/8/8.1.0/ui/logback.xml
similarity index 100%
rename from 6/6.0-beta/ui/logback.xml
rename to archive/8/8.1.0/ui/logback.xml
diff --git a/8/8.2.0/base-es7/Dockerfile b/archive/8/8.2.0/base-es7/Dockerfile
similarity index 100%
rename from 8/8.2.0/base-es7/Dockerfile
rename to archive/8/8.2.0/base-es7/Dockerfile
diff --git a/8/8.2.0/base/Dockerfile b/archive/8/8.2.0/base/Dockerfile
similarity index 100%
rename from 8/8.2.0/base/Dockerfile
rename to archive/8/8.2.0/base/Dockerfile
diff --git a/8/8.2.0/compose-es7/docker-compose.yml b/archive/8/8.2.0/compose-es7/docker-compose.yml
similarity index 100%
rename from 8/8.2.0/compose-es7/docker-compose.yml
rename to archive/8/8.2.0/compose-es7/docker-compose.yml
diff --git a/8/8.2.0/compose/docker-compose.yml b/archive/8/8.2.0/compose/docker-compose.yml
similarity index 100%
rename from 8/8.2.0/compose/docker-compose.yml
rename to archive/8/8.2.0/compose/docker-compose.yml
diff --git a/8/8.2.0/oap-es7/Dockerfile b/archive/8/8.2.0/oap-es7/Dockerfile
similarity index 100%
rename from 8/8.2.0/oap-es7/Dockerfile
rename to archive/8/8.2.0/oap-es7/Dockerfile
diff --git a/8/8.2.0/oap-es7/README.md b/archive/8/8.2.0/oap-es7/README.md
similarity index 100%
rename from 8/8.2.0/oap-es7/README.md
rename to archive/8/8.2.0/oap-es7/README.md
diff --git a/8/8.3.0/oap-es7/docker-entrypoint.sh b/archive/8/8.2.0/oap-es7/docker-entrypoint.sh
similarity index 100%
copy from 8/8.3.0/oap-es7/docker-entrypoint.sh
copy to archive/8/8.2.0/oap-es7/docker-entrypoint.sh
diff --git a/7/7.0/oap-es7/log4j2.xml b/archive/8/8.2.0/oap-es7/log4j2.xml
similarity index 100%
rename from 7/7.0/oap-es7/log4j2.xml
rename to archive/8/8.2.0/oap-es7/log4j2.xml
diff --git a/8/8.2.0/oap/Dockerfile b/archive/8/8.2.0/oap/Dockerfile
similarity index 100%
rename from 8/8.2.0/oap/Dockerfile
rename to archive/8/8.2.0/oap/Dockerfile
diff --git a/8/8.2.0/oap/README.md b/archive/8/8.2.0/oap/README.md
similarity index 100%
rename from 8/8.2.0/oap/README.md
rename to archive/8/8.2.0/oap/README.md
diff --git a/8/8.3.0/oap/docker-entrypoint.sh b/archive/8/8.2.0/oap/docker-entrypoint.sh
similarity index 100%
copy from 8/8.3.0/oap/docker-entrypoint.sh
copy to archive/8/8.2.0/oap/docker-entrypoint.sh
diff --git a/6/6.6/oap/log4j2.xml b/archive/8/8.2.0/oap/log4j2.xml
similarity index 100%
rename from 6/6.6/oap/log4j2.xml
rename to archive/8/8.2.0/oap/log4j2.xml
diff --git a/8/8.2.0/ui/Dockerfile b/archive/8/8.2.0/ui/Dockerfile
similarity index 100%
rename from 8/8.2.0/ui/Dockerfile
rename to archive/8/8.2.0/ui/Dockerfile
diff --git a/8/8.2.0/ui/README.md b/archive/8/8.2.0/ui/README.md
similarity index 100%
rename from 8/8.2.0/ui/README.md
rename to archive/8/8.2.0/ui/README.md
diff --git a/8/8.3.0/ui/docker-entrypoint.sh b/archive/8/8.2.0/ui/docker-entrypoint.sh
similarity index 100%
copy from 8/8.3.0/ui/docker-entrypoint.sh
copy to archive/8/8.2.0/ui/docker-entrypoint.sh
diff --git a/6/6.0-alpha/ui/logback.xml b/archive/8/8.2.0/ui/logback.xml
similarity index 100%
rename from 6/6.0-alpha/ui/logback.xml
rename to archive/8/8.2.0/ui/logback.xml
diff --git a/8/8.3.0/base-es7/Dockerfile b/archive/8/8.3.0/base-es7/Dockerfile
similarity index 100%
copy from 8/8.3.0/base-es7/Dockerfile
copy to archive/8/8.3.0/base-es7/Dockerfile
diff --git a/8/8.3.0/base/Dockerfile b/archive/8/8.3.0/base/Dockerfile
similarity index 100%
copy from 8/8.3.0/base/Dockerfile
copy to archive/8/8.3.0/base/Dockerfile
diff --git a/8/8.3.0/compose-es7/docker-compose.yml b/archive/8/8.3.0/compose-es7/docker-compose.yml
similarity index 100%
copy from 8/8.3.0/compose-es7/docker-compose.yml
copy to archive/8/8.3.0/compose-es7/docker-compose.yml
diff --git a/8/8.3.0/compose/docker-compose.yml b/archive/8/8.3.0/compose/docker-compose.yml
similarity index 100%
copy from 8/8.3.0/compose/docker-compose.yml
copy to archive/8/8.3.0/compose/docker-compose.yml
diff --git a/8/8.3.0/oap-es7/Dockerfile b/archive/8/8.3.0/oap-es7/Dockerfile
similarity index 100%
copy from 8/8.3.0/oap-es7/Dockerfile
copy to archive/8/8.3.0/oap-es7/Dockerfile
diff --git a/8/8.3.0/oap-es7/README.md b/archive/8/8.3.0/oap-es7/README.md
similarity index 100%
copy from 8/8.3.0/oap-es7/README.md
copy to archive/8/8.3.0/oap-es7/README.md
diff --git a/8/8.2.0/oap-es7/docker-entrypoint.sh b/archive/8/8.3.0/oap-es7/docker-entrypoint.sh
similarity index 100%
rename from 8/8.2.0/oap-es7/docker-entrypoint.sh
rename to archive/8/8.3.0/oap-es7/docker-entrypoint.sh
diff --git a/6/6.6/oap-es7/log4j2.xml b/archive/8/8.3.0/oap-es7/log4j2.xml
similarity index 100%
rename from 6/6.6/oap-es7/log4j2.xml
rename to archive/8/8.3.0/oap-es7/log4j2.xml
diff --git a/8/8.3.0/oap/Dockerfile b/archive/8/8.3.0/oap/Dockerfile
similarity index 100%
copy from 8/8.3.0/oap/Dockerfile
copy to archive/8/8.3.0/oap/Dockerfile
diff --git a/8/8.3.0/oap/README.md b/archive/8/8.3.0/oap/README.md
similarity index 100%
copy from 8/8.3.0/oap/README.md
copy to archive/8/8.3.0/oap/README.md
diff --git a/8/8.2.0/oap/docker-entrypoint.sh b/archive/8/8.3.0/oap/docker-entrypoint.sh
similarity index 100%
rename from 8/8.2.0/oap/docker-entrypoint.sh
rename to archive/8/8.3.0/oap/docker-entrypoint.sh
diff --git a/6/6.5/oap/log4j2.xml b/archive/8/8.3.0/oap/log4j2.xml
similarity index 100%
rename from 6/6.5/oap/log4j2.xml
rename to archive/8/8.3.0/oap/log4j2.xml
diff --git a/8/8.3.0/ui/Dockerfile b/archive/8/8.3.0/ui/Dockerfile
similarity index 100%
copy from 8/8.3.0/ui/Dockerfile
copy to archive/8/8.3.0/ui/Dockerfile
diff --git a/8/8.3.0/ui/README.md b/archive/8/8.3.0/ui/README.md
similarity index 100%
copy from 8/8.3.0/ui/README.md
copy to archive/8/8.3.0/ui/README.md
diff --git a/8/8.2.0/ui/docker-entrypoint.sh b/archive/8/8.3.0/ui/docker-entrypoint.sh
similarity index 100%
rename from 8/8.2.0/ui/docker-entrypoint.sh
rename to archive/8/8.3.0/ui/docker-entrypoint.sh
diff --git a/6/6.0-GA/ui/logback.xml b/archive/8/8.3.0/ui/logback.xml
similarity index 100%
rename from 6/6.0-GA/ui/logback.xml
rename to archive/8/8.3.0/ui/logback.xml
diff --git a/8/8.3.0/base-es7/Dockerfile b/base-es7/Dockerfile
similarity index 100%
rename from 8/8.3.0/base-es7/Dockerfile
rename to base-es7/Dockerfile
diff --git a/8/8.3.0/base/Dockerfile b/base/Dockerfile
similarity index 54%
rename from 8/8.3.0/base/Dockerfile
rename to base/Dockerfile
index aa40028..df5be1e 100644
--- a/8/8.3.0/base/Dockerfile
+++ b/base/Dockerfile
@@ -18,43 +18,63 @@ FROM adoptopenjdk/openjdk11:alpine AS build
LABEL maintainer="hanahmily@apache.org,tanjian@apache.org"
+ARG version
+ARG cli_version=0.5.0
+
+ENV SKYWALKING_VERSION=${version}
+ENV SKYWALKING_CLI_VERSION=${cli_version}
+ENV SKYWALKING_TGZ=apache-skywalking-apm-$SKYWALKING_VERSION.tar.gz
+ENV SKYWALKING_ASC=${SKYWALKING_TGZ}.asc
+ENV SKYWALKING_SHA512=${SKYWALKING_TGZ}.sha512
+ENV SKYWALKING_CLI_TGZ=skywalking-cli-$SKYWALKING_CLI_VERSION-bin.tgz
+ENV SKYWALKING_CLI_ASC=${SKYWALKING_CLI_TGZ}.asc
+ENV SKYWALKING_CLI_SHA512=${SKYWALKING_CLI_TGZ}.sha512
+
ENV SKYWALKING_HOME=/skywalking
RUN mkdir -p "${SKYWALKING_HOME}"
WORKDIR $SKYWALKING_HOME
-ENV GPG_KEYS A968F6905E0ACB59E5B24C15D3D9CD50820184C2 B0801BC746F965029A1338072EF5026E70A55777 D360AB2AB20B28403270E2CBE8608938DB25E06B F5B319063296F6B8207748D58BD99F552D9F33D7 F5B319063296F6B8207748D58BD99F552D9F33D7 820232B5C115CE5D30DB03F9711C739B21E3F079
-ENV SKYWALKING_VERSION=8.3.0
-ENV SKYWALKING_CLI_VERSION=0.5.0
-ENV SKYWALKING_SHA512 975be1ce7c787b5fccd7e28c6c0c563218a6454fb086ef92afcd3c115a60e3f38ac48c967da7f2b1af380ce7fb2653643b42ad6fd8419401024469ae0afcd64e
-ENV SKYWALKING_CLI_SHA512 a5da15e68f93bf1c8409aeab219d166f89353bf97b055f8b217d3095d8b3b45e550266188af9cc7f17ae6bbcb08ccffa90e3d4d6227bc0ad9949359b21d3adb5
-
ENV SKYWALKING_TGZ_URLS \
- https://www.apache.org/dyn/closer.cgi?action=download&filename=skywalking/$SKYWALKING_VERSION/apache-skywalking-apm-$SKYWALKING_VERSION.tar.gz \
+ https://www.apache.org/dyn/closer.cgi?action=download&filename=skywalking/$SKYWALKING_VERSION/$SKYWALKING_TGZ \
# if the version is outdated, we might have to pull from the dist/archive :/
- https://www-us.apache.org/dist/skywalking/$SKYWALKING_VERSION/apache-skywalking-apm-$SKYWALKING_VERSION.tar.gz \
- https://www.apache.org/dist/skywalking/$SKYWALKING_VERSION/apache-skywalking-apm-$SKYWALKING_VERSION.tar.gz \
- https://archive.apache.org/dist/skywalking/$SKYWALKING_VERSION/apache-skywalking-apm-$SKYWALKING_VERSION.tar.gz
+ https://www-us.apache.org/dist/skywalking/$SKYWALKING_VERSION/$SKYWALKING_TGZ \
+ https://www.apache.org/dist/skywalking/$SKYWALKING_VERSION/$SKYWALKING_TGZ \
+ https://archive.apache.org/dist/skywalking/$SKYWALKING_VERSION/$SKYWALKING_TGZ
ENV SKYWALKING_ASC_URLS \
- https://www.apache.org/dyn/closer.cgi?action=download&filename=skywalking/$SKYWALKING_VERSION/apache-skywalking-apm-$SKYWALKING_VERSION.tar.gz.asc \
+ https://www.apache.org/dyn/closer.cgi?action=download&filename=skywalking/$SKYWALKING_VERSION/$SKYWALKING_ASC \
# if the version is outdated, we might have to pull from the dist/archive :/
- https://www-us.apache.org/dist/skywalking/$SKYWALKING_VERSION/apache-skywalking-apm-$SKYWALKING_VERSION.tar.gz.asc \
- https://www.apache.org/dist/skywalking/$SKYWALKING_VERSION/apache-skywalking-apm-$SKYWALKING_VERSION.tar.gz.asc \
- https://archive.apache.org/dist/skywalking/$SKYWALKING_VERSION/apache-skywalking-apm-$SKYWALKING_VERSION.tar.gz.asc
+ https://www-us.apache.org/dist/skywalking/$SKYWALKING_VERSION/$SKYWALKING_ASC \
+ https://www.apache.org/dist/skywalking/$SKYWALKING_VERSION/$SKYWALKING_ASC \
+ https://archive.apache.org/dist/skywalking/$SKYWALKING_VERSION/$SKYWALKING_ASC
+
+ENV SKYWALKING_SHA512_URLS \
+ https://www.apache.org/dyn/closer.cgi?action=download&filename=skywalking/$SKYWALKING_VERSION/$SKYWALKING_SHA512 \
+ # if the version is outdated, we might have to pull from the dist/archive :/
+ https://www-us.apache.org/dist/skywalking/$SKYWALKING_VERSION/$SKYWALKING_SHA512 \
+ https://www.apache.org/dist/skywalking/$SKYWALKING_VERSION/$SKYWALKING_SHA512 \
+ https://archive.apache.org/dist/skywalking/$SKYWALKING_VERSION/$SKYWALKING_SHA512
ENV SKYWALKING_CLI_TGZ_URLS \
- https://www.apache.org/dyn/closer.cgi?action=download&filename=skywalking/cli/$SKYWALKING_CLI_VERSION/skywalking-cli-$SKYWALKING_CLI_VERSION-bin.tgz \
+ https://www.apache.org/dyn/closer.cgi?action=download&filename=skywalking/cli/$SKYWALKING_CLI_VERSION/$SKYWALKING_CLI_TGZ \
+ # if the version is outdated, we might have to pull from the dist/archive :/
+ https://www-us.apache.org/dist/skywalking/cli/$SKYWALKING_CLI_VERSION/$SKYWALKING_CLI_TGZ \
+ https://www.apache.org/dist/skywalking/cli/$SKYWALKING_CLI_VERSION/$SKYWALKING_CLI_TGZ \
+ https://archive.apache.org/dist/skywalking/cli/$SKYWALKING_CLI_VERSION/$SKYWALKING_CLI_TGZ
+
+ENV SKYWALKING_CLI_ASC_URLS \
+ https://www.apache.org/dyn/closer.cgi?action=download&filename=skywalking/$SKYWALKING_CLI_VERSION/$SKYWALKING_CLI_ASC \
# if the version is outdated, we might have to pull from the dist/archive :/
- https://www-us.apache.org/dist/skywalking/cli/$SKYWALKING_CLI_VERSION/skywalking-cli-$SKYWALKING_CLI_VERSION-bin.tgz \
- https://www.apache.org/dist/skywalking/cli/$SKYWALKING_CLI_VERSION/skywalking-cli-$SKYWALKING_CLI_VERSION-bin.tgz \
- https://archive.apache.org/dist/skywalking/cli/$SKYWALKING_CLI_VERSION/skywalking-cli-$SKYWALKING_CLI_VERSION-bin.tgz
+ https://www-us.apache.org/dist/skywalking/cli/$SKYWALKING_CLI_VERSION/$SKYWALKING_CLI_ASC \
+ https://www.apache.org/dist/skywalking/cli/$SKYWALKING_CLI_VERSION/$SKYWALKING_CLI_ASC \
+ https://archive.apache.org/dist/skywalking/cli/$SKYWALKING_CLI_VERSION/$SKYWALKING_CLI_ASC
ENV SKYWALKING_CLI_ASC_URLS \
- https://www.apache.org/dyn/closer.cgi?action=download&filename=skywalking/$SKYWALKING_CLI_VERSION/skywalking-cli-$SKYWALKING_CLI_VERSION-bin.tgz.asc \
+ https://www.apache.org/dyn/closer.cgi?action=download&filename=skywalking/$SKYWALKING_CLI_VERSION/$SKYWALKING_CLI_SHA512 \
# if the version is outdated, we might have to pull from the dist/archive :/
- https://www-us.apache.org/dist/skywalking/cli/$SKYWALKING_CLI_VERSION/skywalking-cli-$SKYWALKING_CLI_VERSION-bin.tgz.asc \
- https://www.apache.org/dist/skywalking/cli/$SKYWALKING_CLI_VERSION/skywalking-cli-$SKYWALKING_CLI_VERSION-bin.tgz.asc \
- https://archive.apache.org/dist/skywalking/cli/$SKYWALKING_CLI_VERSION/skywalking-cli-$SKYWALKING_CLI_VERSION-bin.tgz.asc
+ https://www-us.apache.org/dist/skywalking/cli/$SKYWALKING_CLI_VERSION/$SKYWALKING_CLI_SHA512 \
+ https://www.apache.org/dist/skywalking/cli/$SKYWALKING_CLI_VERSION/$SKYWALKING_CLI_SHA512 \
+ https://archive.apache.org/dist/skywalking/cli/$SKYWALKING_CLI_VERSION/$SKYWALKING_CLI_SHA512
RUN set -eux; \
\
@@ -65,63 +85,83 @@ RUN set -eux; \
openssl \
; \
\
+ wget -O KEYS https://downloads.apache.org/skywalking/KEYS; \
export GNUPGHOME="$(mktemp -d)"; \
- for key in $GPG_KEYS; do \
- gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
- done; \
+ gpg --import KEYS; \
\
success=; \
for url in $SKYWALKING_TGZ_URLS; do \
- if wget -O skywalking.tar.gz "$url"; then \
+ if wget -O ${SKYWALKING_TGZ} "$url"; then \
success=1; \
break; \
fi; \
done; \
[ -n "$success" ]; \
\
- echo "$SKYWALKING_SHA512 *skywalking.tar.gz" | sha512sum -c -; \
+ success=; \
+ for url in $SKYWALKING_SHA512_URLS; do \
+ if wget -O ${SKYWALKING_SHA512} "$url"; then \
+ success=1; \
+ break; \
+ fi; \
+ done; \
+ [ -n "$success" ]; \
+ \
+ cat ${SKYWALKING_SHA512} | sha512sum -c -; \
\
success=; \
for url in $SKYWALKING_ASC_URLS; do \
- if wget -O skywalking.tar.gz.asc "$url"; then \
+ if wget -O ${SKYWALKING_ASC} "$url"; then \
success=1; \
break; \
fi; \
done; \
[ -n "$success" ]; \
\
- gpg --batch --verify skywalking.tar.gz.asc skywalking.tar.gz; \
+ gpg --batch --verify ${SKYWALKING_ASC} ${SKYWALKING_TGZ}; \
+ mv ${SKYWALKING_TGZ} skywalking.tar.gz; \
tar -xvf skywalking.tar.gz --strip-components=1; \
rm -rf bin/; \
rm skywalking.tar.gz*; \
+ rm ${SKYWALKING_TGZ}*; \
success=; \
for url in $SKYWALKING_CLI_TGZ_URLS; do \
- if wget -O skywalking-cli-bin.tgz "$url"; then \
+ if wget -O ${SKYWALKING_CLI_TGZ} "$url"; then \
+ success=1; \
+ break; \
+ fi; \
+ done; \
+ [ -n "$success" ]; \
+ \
+ success=; \
+ for url in $SKYWALKING_CLI_SHA512_URLS; do \
+ if wget -O ${SKYWALKING_CLI_SHA512} "$url"; then \
success=1; \
break; \
fi; \
done; \
[ -n "$success" ]; \
\
- echo "$SKYWALKING_CLI_SHA512 *skywalking-cli-bin.tgz" | sha512sum -c -; \
+ cat ${SKYWALKING_CLI_SHA512} | sha512sum -c -; \
\
success=; \
for url in $SKYWALKING_CLI_ASC_URLS; do \
- if wget -O skywalking-cli-bin.tgz.asc "$url"; then \
+ if wget -O ${SKYWALKING_ASC} "$url"; then \
success=1; \
break; \
fi; \
done; \
[ -n "$success" ]; \
\
- gpg --batch --verify skywalking-cli-bin.tgz.asc skywalking-cli-bin.tgz; \
- tar -xvf skywalking-cli-bin.tgz; \
+ 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/; \
chmod 755 bin/*; \
rm skywalking-cli-bin.tgz*; \
+ rm ${SKYWALKING_CLI_TGZ}*; \
command -v gpgconf && gpgconf --kill all || :; \
rm -rf "$GNUPGHOME"; \
apk del .fetch-deps
diff --git a/8/8.3.0/compose-es7/docker-compose.yml b/compose-es7/docker-compose.yml
similarity index 100%
rename from 8/8.3.0/compose-es7/docker-compose.yml
rename to compose-es7/docker-compose.yml
diff --git a/8/8.3.0/compose/docker-compose.yml b/compose/docker-compose.yml
similarity index 100%
rename from 8/8.3.0/compose/docker-compose.yml
rename to compose/docker-compose.yml
diff --git a/8/8.3.0/oap-es7/Dockerfile b/oap-es7/Dockerfile
similarity index 100%
rename from 8/8.3.0/oap-es7/Dockerfile
rename to oap-es7/Dockerfile
diff --git a/8/8.3.0/oap-es7/README.md b/oap-es7/README.md
similarity index 100%
rename from 8/8.3.0/oap-es7/README.md
rename to oap-es7/README.md
diff --git a/8/8.3.0/oap-es7/docker-entrypoint.sh b/oap-es7/docker-entrypoint.sh
similarity index 100%
rename from 8/8.3.0/oap-es7/docker-entrypoint.sh
rename to oap-es7/docker-entrypoint.sh
diff --git a/8/8.3.0/oap/log4j2.xml b/oap-es7/log4j2.xml
similarity index 100%
copy from 8/8.3.0/oap/log4j2.xml
copy to oap-es7/log4j2.xml
diff --git a/8/8.3.0/oap/Dockerfile b/oap/Dockerfile
similarity index 100%
rename from 8/8.3.0/oap/Dockerfile
rename to oap/Dockerfile
diff --git a/8/8.3.0/oap/README.md b/oap/README.md
similarity index 100%
rename from 8/8.3.0/oap/README.md
rename to oap/README.md
diff --git a/8/8.3.0/oap/docker-entrypoint.sh b/oap/docker-entrypoint.sh
similarity index 100%
rename from 8/8.3.0/oap/docker-entrypoint.sh
rename to oap/docker-entrypoint.sh
diff --git a/8/8.3.0/oap/log4j2.xml b/oap/log4j2.xml
similarity index 100%
rename from 8/8.3.0/oap/log4j2.xml
rename to oap/log4j2.xml
diff --git a/8/8.3.0/ui/Dockerfile b/ui/Dockerfile
similarity index 100%
rename from 8/8.3.0/ui/Dockerfile
rename to ui/Dockerfile
diff --git a/8/8.3.0/ui/README.md b/ui/README.md
similarity index 100%
rename from 8/8.3.0/ui/README.md
rename to ui/README.md
diff --git a/8/8.3.0/ui/docker-entrypoint.sh b/ui/docker-entrypoint.sh
similarity index 100%
rename from 8/8.3.0/ui/docker-entrypoint.sh
rename to ui/docker-entrypoint.sh
diff --git a/8/8.3.0/ui/logback.xml b/ui/logback.xml
similarity index 100%
rename from 8/8.3.0/ui/logback.xml
rename to ui/logback.xml