[skywalking] branch docker/agent updated (05571b7 -> efff64a)

[ke...@apache.org]

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

kezhenxu94 pushed a change to branch docker/agent
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


 discard 05571b7  feature: add dockerfile for agent image
     new efff64a  feature: add dockerfile for agent image

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (05571b7)
            \
             N -- N -- N   refs/heads/docker/agent (efff64a)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

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.


Summary of changes:
 docker/agent/Dockerfile.agent | 2 --
 1 file changed, 2 deletions(-)

[skywalking] 01/01: feature: add dockerfile for agent image

[ke...@apache.org]

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

kezhenxu94 pushed a commit to branch docker/agent
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit efff64a96231d375da9edd476ec1eb23dfe50ff0
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Mon Apr 5 15:43:48 2021 +0800

    feature: add dockerfile for agent image
---
 Makefile                      |  6 +++++-
 docker/agent/Dockerfile.agent | 30 ++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 69bff7e..4ec2a1e 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ ES_VERSION?=es6
 
 docker: init build.all docker.all
 
-DOCKER_TARGETS:=docker.oap docker.ui
+DOCKER_TARGETS:=docker.oap docker.ui docker.agent
 
 docker.all: $(DOCKER_TARGETS)
 
@@ -81,6 +81,10 @@ docker.ui: $(SW_ROOT)/docker/ui/docker-entrypoint.sh
 docker.ui: $(SW_ROOT)/docker/ui/logback.xml
 		$(DOCKER_RULE)
 
+docker.agent: $(SW_OUT)/apache-skywalking-apm-bin.tar.gz
+docker.agent: $(SW_ROOT)/docker/agent/Dockerfile.agent
+		$(DOCKER_RULE)
+
 
 # $@ is the name of the target
 # $^ the name of the dependencies for the target
diff --git a/docker/agent/Dockerfile.agent b/docker/agent/Dockerfile.agent
new file mode 100644
index 0000000..ddc4c30
--- /dev/null
+++ b/docker/agent/Dockerfile.agent
@@ -0,0 +1,30 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+FROM alpine as build
+
+ARG DIST_NAME
+
+ADD "$DIST_NAME.tar.gz" /
+
+FROM apache/skywalking-base:8.4.0-es6 AS cli
+
+ARG BASE_IMAGE='adoptopenjdk/openjdk8:alpine'
+
+FROM $BASE_IMAGE
+
+COPY --from=build /agent /skywalking/agent
+COPY --from=cli /skywalking/bin/swctl /skywalking/bin