From e49a25adb1779b0ed57414a02c1ae43c2fe36404 Mon Sep 17 00:00:00 2001 From: Zexi Li Date: Thu, 29 Jul 2021 19:21:17 +0800 Subject: [PATCH] feat(build): update ansibleserver dockerfile --- build/docker/Dockerfile.ansibleserver | 4 ++-- build/docker/Makefile | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/build/docker/Dockerfile.ansibleserver b/build/docker/Dockerfile.ansibleserver index bfbec0f43f..c5d52aea1c 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.2.1 /opt/yunion/playbook /opt/yunion/playbook -COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.2.1 /opt/yunion/ansible-install-pkg /opt/yunion/ansible-install-pkg +COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.2.2 /opt/yunion/playbook /opt/yunion/playbook +COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.2.2 /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/Makefile b/build/docker/Makefile index cb5a01c7c6..51de7bb75d 100644 --- a/build/docker/Makefile +++ b/build/docker/Makefile @@ -18,3 +18,8 @@ BAREMETAL_BASE_VERSION = v0.3.1 baremetal-base: $(DOCKER_BUILDX)/baremetal-base:$(BAREMETAL_BASE_VERSION) -f ./Dockerfile.baremetal-base . #docker push $(REGISTRY)/baremetal-base:$(BAREMETAL_BASE_VERSION) + +FILE_REPO_VERSION = v0.2.2 + +file-repo: + $(DOCKER_BUILDX)/file-repo:$(FILE_REPO_VERSION) -f ./Dockerfile.file-repo .