diff --git a/build/docker/Dockerfile.ansibleserver b/build/docker/Dockerfile.ansibleserver index 32e359ef4d..5c39fe9d3a 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.1.1 +FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:v1.1.3 # install playbook and telegraf install pkg -COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.5.2 /opt/yunion/playbook /opt/yunion/playbook -COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.5.2 /opt/yunion/ansible-install-pkg /opt/yunion/ansible-install-pkg +COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.5.4 /opt/yunion/playbook /opt/yunion/playbook +COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.5.4 /opt/yunion/ansible-install-pkg /opt/yunion/ansible-install-pkg ADD ./_output/alpine-build/bin/ansibleserver /opt/yunion/bin/ansibleserver diff --git a/build/docker/Dockerfile.ansibleserver-base b/build/docker/Dockerfile.ansibleserver-base index 5c4affbc0f..ce07c3c3d0 100644 --- a/build/docker/Dockerfile.ansibleserver-base +++ b/build/docker/Dockerfile.ansibleserver-base @@ -1,4 +1,4 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.15.4-0 MAINTAINER "Yousong Zhou " diff --git a/build/docker/Dockerfile.file-repo b/build/docker/Dockerfile.file-repo index 367ab5caf7..5a9409863d 100644 --- a/build/docker/Dockerfile.file-repo +++ b/build/docker/Dockerfile.file-repo @@ -1,8 +1,8 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.4.0 as file-repo +FROM registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.5.0 AS file-repo FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2 -MAINTAINER "Rain Zheng " +LABEL maintainer="Rain Zheng " # openssh-client, for ansible ssh connection # git, ca-certificates, for fetching ansible roles @@ -12,15 +12,12 @@ RUN set -x \ && rm -rf /var/cache/apk/* # install default playbook and install pkg -Run mkdir -p /opt/yunion/ansible-install-pkg +RUN mkdir -p /opt/yunion/ansible-install-pkg -COPY --from=file-repo /opt/yunion/ansible-install-pkg/telegraf-1.19.2-yn~be742cbf-0.x86_64.rpm /opt/yunion/ansible-install-pkg -COPY --from=file-repo /opt/yunion/ansible-install-pkg/telegraf-1.19.2-yn~be742cbf-0.aarch64.rpm /opt/yunion/ansible-install-pkg -COPY --from=file-repo /opt/yunion/ansible-install-pkg/telegraf_1.19.2-yn~be742cbf-0_arm64.deb /opt/yunion/ansible-install-pkg -COPY --from=file-repo /opt/yunion/ansible-install-pkg/telegraf_1.19.2-yn~be742cbf-0_amd64.deb /opt/yunion/ansible-install-pkg -COPY --from=file-repo /opt/yunion/ansible-install-pkg/telegraf-1.19.2-yn~be742cbf_windows_amd64.zip /opt/yunion/ansible-install-pkg -COPY --from=file-repo /opt/yunion/ansible-install-pkg/telegraf-1.19.2-yn~be742cbf_windows_i386.zip /opt/yunion/ansible-install-pkg +COPY --from=file-repo /opt/yunion/ansible-install-pkg/telegraf*.rpm /opt/yunion/ansible-install-pkg +COPY --from=file-repo /opt/yunion/ansible-install-pkg/telegraf*.deb /opt/yunion/ansible-install-pkg +COPY --from=file-repo /opt/yunion/ansible-install-pkg/telegraf*.zip /opt/yunion/ansible-install-pkg -Run mkdir -p /opt/yunion/playbook -Run mkdir /opt/yunion/playbook/monitor-agent -Run git clone https://github.com/yunionio/monitor-agent.git /opt/yunion/playbook/monitor-agent --recurse-submodules +RUN mkdir -p /opt/yunion/playbook +RUN mkdir /opt/yunion/playbook/monitor-agent +RUN git clone https://github.com/yunionio/monitor-agent.git /opt/yunion/playbook/monitor-agent --recurse-submodules diff --git a/build/docker/Makefile b/build/docker/Makefile index 12fbc570b5..7204cdde2c 100644 --- a/build/docker/Makefile +++ b/build/docker/Makefile @@ -15,7 +15,7 @@ onecloud-base: onecloud-base-3-15-4: $(DOCKER_BUILDX)/onecloud-base:$(ONECLOUD_BASE_VERSION_3-15-4) -f ./Dockerfile.onecloud-base-3-15-4 . -ANSIBLESERVER_BASE = v1.1.2 +ANSIBLESERVER_BASE = v1.1.3 ansibleserver-base: $(DOCKER_BUILDX)/ansibleserver-base:$(ANSIBLESERVER_BASE) -f ./Dockerfile.ansibleserver-base . @@ -44,7 +44,7 @@ GLANCE_BASE_VERSION = v0.0.1 glance-base: $(DOCKER_BUILDX)/glance-base:$(GLANCE_BASE_VERSION) -f ./Dockerfile.glance-base . -FILE_REPO_VERSION = v0.5.2 +FILE_REPO_VERSION = v0.5.4 file-repo: $(DOCKER_BUILDX)/file-repo:$(FILE_REPO_VERSION) -f ./Dockerfile.file-repo .