Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
润土的好友猹
SkyWalking
提交
8d7d8650
S
SkyWalking
项目概览
润土的好友猹
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
9
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
8d7d8650
编写于
4月 06, 2021
作者:
Z
Zhenxu Ke
提交者:
GitHub
4月 06, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add Dockerfile and build script for Java agent Docker image (#6686)
上级
0f43dd61
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
52 addition
and
1 deletion
+52
-1
CHANGES.md
CHANGES.md
+1
-0
Makefile
Makefile
+5
-1
docker/agent/Dockerfile.agent
docker/agent/Dockerfile.agent
+46
-0
未找到文件。
CHANGES.md
浏览文件 @
8d7d8650
...
...
@@ -9,6 +9,7 @@ Release Notes.
*
Update frontend-maven-plugin to 1.11.0, for Download node x64 binary on Apple Silicon.
*
Add E2E test for VM monitoring that metrics from Prometheus node-exporter.
*
Upgrade lombok to 1.18.16.
*
Add Java agent Dockerfile to build Docker image for Java agent.
#### Java Agent
*
Remove invalid mysql configuration in agent.config.
...
...
Makefile
浏览文件 @
8d7d8650
...
...
@@ -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
...
...
docker/agent/Dockerfile.agent
0 → 100644
浏览文件 @
8d7d8650
# 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.
ARG BASE_IMAGE='adoptopenjdk/openjdk8:alpine'
FROM alpine as build
ENV DIST_NAME=apache-skywalking-apm-bin
ADD "$DIST_NAME.tar.gz" /
RUN mv /$DIST_NAME /skywalking
FROM alpine AS cli
WORKDIR /skywalking/bin
ARG CLI_VERSION=0.6.0
ADD https://archive.apache.org/dist/skywalking/cli/${CLI_VERSION}/skywalking-cli-${CLI_VERSION}-bin.tgz /
RUN tar -zxf /skywalking-cli-${CLI_VERSION}-bin.tgz -C / ; \
mv /skywalking-cli-${CLI_VERSION}-bin/bin/swctl-${CLI_VERSION}-linux-amd64 /skywalking/bin/swctl
FROM $BASE_IMAGE
LABEL maintainer="kezhenxu94@apache.org"
ENV JAVA_TOOL_OPTIONS=-javaagent:/skywalking/agent/skywalking-agent.jar
WORKDIR /skywalking
COPY --from=build /skywalking/agent /skywalking/agent
COPY --from=cli /skywalking/bin/swctl /skywalking/bin
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录