From 0e06f9c6cccfe054dbcd39e211b30a0bc050ba2b Mon Sep 17 00:00:00 2001 From: rainzm Date: Tue, 20 Jul 2021 19:41:23 +0800 Subject: [PATCH 1/2] feat: use yunion's customized version of telegraf in file-repo --- build/docker/Dockerfile.file-repo | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/build/docker/Dockerfile.file-repo b/build/docker/Dockerfile.file-repo index 27969a44f5..ce3f26a6b0 100644 --- a/build/docker/Dockerfile.file-repo +++ b/build/docker/Dockerfile.file-repo @@ -11,11 +11,10 @@ RUN set -x \ # install default playbook and install pkg Run mkdir -p /opt/yunion/ansible-install-pkg -Run wget https://dl.influxdata.com/telegraf/releases/telegraf-1.17.0-1.x86_64.rpm -P /opt/yunion/ansible-install-pkg -Run wget https://dl.influxdata.com/telegraf/releases/telegraf-1.17.0-1.aarch64.rpm -P /opt/yunion/ansible-install-pkg -Run wget https://dl.influxdata.com/telegraf/releases/telegraf-1.17.0_windows_amd64.zip -P /opt/yunion/ansible-install-pkg -Run wget https://dl.influxdata.com/telegraf/releases/telegraf_1.17.0-1_amd64.deb -P /opt/yunion/ansible-install-pkg -Run wget https://dl.influxdata.com/telegraf/releases/telegraf_1.17.0-1_arm64.deb -P /opt/yunion/ansible-install-pkg +Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf-1.5.0~yn-1.aarch64.rpm -P /opt/yunion/ansible-install-pkg +Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf-1.5.0~yn-1.x86_64.rpm -P /opt/yunion/ansible-install-pkg +Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf_1.5.0~yn-1_amd64.deb -P /opt/yunion/ansible-install-pkg +Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf_1.5.0~yn-1_arm64.deb -P /opt/yunion/ansible-install-pkg Run mkdir -p /opt/yunion/playbook Run mkdir /opt/yunion/playbook/monitor-agent From bbb95343e235405829fc549046b3e75f84b944ee Mon Sep 17 00:00:00 2001 From: rainzm Date: Tue, 20 Jul 2021 19:42:15 +0800 Subject: [PATCH 2/2] feat: update file-repo version --- build/docker/Dockerfile.ansibleserver | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/docker/Dockerfile.ansibleserver b/build/docker/Dockerfile.ansibleserver index 6ca84ab688..710cb58990 100644 --- a/build/docker/Dockerfile.ansibleserver +++ b/build/docker/Dockerfile.ansibleserver @@ -1,7 +1,7 @@ FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:v1.0.3 # install playbook and telegraf install pkg -COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.1.3 /opt/yunion/playbook /opt/yunion/playbook -COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.1.3 /opt/yunion/ansible-install-pkg /opt/yunion/ansible-install-pkg +COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.2.0 /opt/yunion/playbook /opt/yunion/playbook +COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.2.0 /opt/yunion/ansible-install-pkg /opt/yunion/ansible-install-pkg ADD ./_output/alpine-build/bin/ansibleserver /opt/yunion/bin/ansibleserver