You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2021/09/07 12:15:00 UTC
[skywalking-docker] branch merge-dist-es67 created (now 42aeb69)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch merge-dist-es67
in repository https://gitbox.apache.org/repos/asf/skywalking-docker.git.
at 42aeb69 Merge Docker images for ES 6 / 7 into one
This branch includes the following new commits:
new 42aeb69 Merge Docker images for ES 6 / 7 into one
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: Merge Docker images for ES 6 / 7 into one
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch merge-dist-es67
in repository https://gitbox.apache.org/repos/asf/skywalking-docker.git
commit 42aeb69a555ddc07631a094d6b3fe07744b57b84
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Tue Sep 7 20:14:48 2021 +0800
Merge Docker images for ES 6 / 7 into one
---
Makefile | 14 ++++----------
README.md | 10 ++++++++--
base/Dockerfile | 10 +---------
compose/.env.es6 | 1 -
compose/.env.es7 | 1 -
compose/docker-compose.yml | 2 +-
java-agent/README.md | 2 +-
oap-server/Dockerfile | 6 +-----
8 files changed, 16 insertions(+), 30 deletions(-)
diff --git a/Makefile b/Makefile
index 202222a..e90c9d6 100644
--- a/Makefile
+++ b/Makefile
@@ -14,17 +14,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-TAG_SUFS := es6 es7
-
ROOT := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
D := docker
DC := docker-compose
-BASE_BUILD_TARGETS := $(TAG_SUFS:%=base.%)
-OAP_BUILD_TARGETS := $(TAG_SUFS:%=oap-server.%)
-COMPLEX_BUILD_TARGETS := $(BASE_BUILD_TARGETS) $(OAP_BUILD_TARGETS)
-COMPOSE_TARGETS := $(TAG_SUFS:%=compose.%)
+COMPLEX_BUILD_TARGETS := base oap-server
+COMPOSE_TARGETS := compose
BUILD_TARGETS := $(COMPLEX_BUILD_TARGETS) ui java-agent
word-dot = $(word $2,$(subst ., ,$1))
@@ -33,10 +29,8 @@ build: $(BUILD_TARGETS)
$(COMPLEX_BUILD_TARGETS):
@echo "Building $@"
- $(eval repo := $(call word-dot,$@,1))
- $(eval imgTag := $(call word-dot,$@,2))
- pushd $(ROOT)/$(repo) \
- && $(D) build $(SW_BUILD_ARGS) --build-arg version=$(SW_VERSION) --build-arg tag=$(imgTag) -t apache/skywalking-$(repo):${SW_VERSION}-${imgTag} . \
+ pushd $(ROOT)/$@ \
+ && $(D) build $(SW_BUILD_ARGS) --build-arg version=$(SW_VERSION) -t apache/skywalking-$@:${SW_VERSION} . \
&& popd
ui:
diff --git a/README.md b/README.md
index 3e46539..2667479 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# Apache SkyWalking Docker Files
-<img src="http://skywalking.apache.org/assets/logo.svg" alt="Sky Walking logo" height="90px" align="right" />
+<img src="https://skywalking.apache.org/assets/logo.svg" alt="Sky Walking logo" height="90px" align="right" />
**SkyWalking**: an APM(application performance monitor) system, especially designed for
microservices, cloud native and container-based (Docker, Kubernetes, Mesos) architectures.
@@ -11,7 +11,7 @@ This repository includes related files of following docker images:
- UI
- Java agent
- Documents of each version are in `v-x.y.z/oap` and `v-x.y.z/ui`. Such as [8.1.0 OAP](8/8.1.0/oap) and [8.1.0 UI](8/8.1.0/ui)
+ Documents of each version are in `v-x.y.z/oap` and `v-x.y.z/ui`. Such as [8.1.0 OAP](archive/8/8.1.0/oap) and [8.1.0 UI](archive/8/8.1.0/ui)
The convenience images are published to Docker Hub and available from the `skywalking.docker.scarf.sh` endpoint.
@@ -24,6 +24,8 @@ Java agent images are available too.
# How to build
+## OAP and UI
+
When the version < `8.4.0`, the release manifests are grouping by their major version number and full version number in `archive`.
From `8.4.0`, issuing follows to build relevant docker images
@@ -35,6 +37,10 @@ source <major_version>/v<version>.sh
make
```
+## Java Agent
+
+
+
# How to publish images
After a SkyWalking's Apache release, composing a new version environment setting script to `<major_version>` folder with the name like `v<version>.sh`
diff --git a/base/Dockerfile b/base/Dockerfile
index 02adb7d..9871d7b 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -13,22 +13,14 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-ARG tag
FROM adoptopenjdk/openjdk11:alpine AS base
ARG version
RUN echo "Building Apache SkyWalking ${version}"
ENV SKYWALKING_VERSION=${version}
-
-FROM base AS es6
-RUN echo "This is the stage that build the es6 image"
ENV SKYWALKING_TGZ=apache-skywalking-apm-${SKYWALKING_VERSION}.tar.gz
-FROM base AS es7
-RUN echo "This is the stage that build the es7 image"
-ENV SKYWALKING_TGZ=apache-skywalking-apm-es7-${SKYWALKING_VERSION}.tar.gz
-
-FROM ${tag} AS build
+FROM base AS build
ENV SKYWALKING_CLI_VERSION=0.7.0
ENV SKYWALKING_ASC=${SKYWALKING_TGZ}.asc
diff --git a/compose/.env.es6 b/compose/.env.es6
index b19df53..dbf4ab0 100644
--- a/compose/.env.es6
+++ b/compose/.env.es6
@@ -16,4 +16,3 @@
ES_VERSION=6.8.18
SW_STORAGE=elasticsearch
-IMAGE_TAG=es6
\ No newline at end of file
diff --git a/compose/.env.es7 b/compose/.env.es7
index b4824c7..730e464 100644
--- a/compose/.env.es7
+++ b/compose/.env.es7
@@ -16,4 +16,3 @@
ES_VERSION=7.10.0
SW_STORAGE=elasticsearch7
-IMAGE_TAG=es7
\ No newline at end of file
diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml
index a21ea43..f13d6a0 100644
--- a/compose/docker-compose.yml
+++ b/compose/docker-compose.yml
@@ -39,7 +39,7 @@ services:
volumes:
- data:/usr/share/elasticsearch/data
oap:
- image: apache/skywalking-oap-server:${SW_VERSION}-${IMAGE_TAG}
+ image: apache/skywalking-oap-server:${SW_VERSION}
container_name: oap
depends_on:
- elasticsearch
diff --git a/java-agent/README.md b/java-agent/README.md
index af6c0f7..19a6ed2 100644
--- a/java-agent/README.md
+++ b/java-agent/README.md
@@ -3,7 +3,7 @@
**Docker images are not official ASF releases but provided for convenience. Recommended usage is always to build the
source**
-<img src="http://skywalking.apache.org/assets/logo.svg" alt="Sky Walking logo" height="90px" align="right" />
+<img src="https://skywalking.apache.org/assets/logo.svg" alt="Sky Walking logo" height="90px" align="right" />
**SkyWalking**: an APM(application performance monitor) system, especially designed for microservices, cloud native and
container-based (Docker, Kubernetes, Mesos) architectures.
diff --git a/oap-server/Dockerfile b/oap-server/Dockerfile
index f4c6bd6..a9b4e8c 100644
--- a/oap-server/Dockerfile
+++ b/oap-server/Dockerfile
@@ -14,10 +14,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-ARG tag
ARG version
-FROM apache/skywalking-base:${version}-${tag} AS build
+FROM apache/skywalking-base:${version} AS build
WORKDIR skywalking
@@ -32,9 +31,6 @@ RUN mkdir ext-config; \
FROM adoptopenjdk/openjdk11:alpine
-ARG tag
-ENV ES_VERSION=${tag}
-
ENV JAVA_OPTS=" -Xms256M "
LABEL maintainer="hanahmily@apache.org,tanjian@apache.org"