diff --git a/Makefile.common.mk b/Makefile.common.mk index 983a2165e8..aad75b4292 100644 --- a/Makefile.common.mk +++ b/Makefile.common.mk @@ -7,8 +7,8 @@ endif ModBaseName:=$(notdir $(ModName)) DockerImageRegistry?=registry.cn-beijing.aliyuncs.com -DockerImageAlpineBuild?=$(DockerImageRegistry)/yunionio/alpine-build:1.0-5 -DockerImageCentOSBuild?=$(DockerImageRegistry)/yunionio/centos-build:1.1-4 +DockerImageAlpineBuild?=$(DockerImageRegistry)/yunionio/alpine-build:1.1-5 +DockerImageCentOSBuild?=$(DockerImageRegistry)/yunionio/centos-build:1.1-5 EnvIf=$(if $($(1)),$(1)=$($(1))) diff --git a/build/docker/Dockerfile.ansibleserver b/build/docker/Dockerfile.ansibleserver index 46cdd6b8f6..028d0d291d 100644 --- a/build/docker/Dockerfile.ansibleserver +++ b/build/docker/Dockerfile.ansibleserver @@ -1,4 +1,4 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:v1.0.3 +FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:v1.0.5 # install playbook and telegraf install pkg COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.3.3 /opt/yunion/playbook /opt/yunion/playbook diff --git a/build/docker/Dockerfile.ansibleserver-base b/build/docker/Dockerfile.ansibleserver-base index 5c0ad22260..ac14df6e69 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.2 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5 MAINTAINER "Yousong Zhou " diff --git a/build/docker/Dockerfile.apigateway b/build/docker/Dockerfile.apigateway index 35918e0b13..9145dadd6d 100644 --- a/build/docker/Dockerfile.apigateway +++ b/build/docker/Dockerfile.apigateway @@ -1,3 +1,3 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5 -ADD ./_output/alpine-build/bin/apigateway /opt/yunion/bin/apigateway \ No newline at end of file +ADD ./_output/alpine-build/bin/apigateway /opt/yunion/bin/apigateway diff --git a/build/docker/Dockerfile.baremetal-base b/build/docker/Dockerfile.baremetal-base index aaf33a4e2b..4a9ba26383 100644 --- a/build/docker/Dockerfile.baremetal-base +++ b/build/docker/Dockerfile.baremetal-base @@ -2,7 +2,7 @@ FROM --platform=linux/amd64 registry.cn-beijing.aliyuncs.com/yunionio/centos-bui RUN yum install -y https://iso.yunion.cn/vm-images/baremetal-pxerom-1.1.0-21080303.x86_64.rpm #RUN yum install -y http://192.168.122.112:8083/baremetal-pxerom-1.1.0-21080303.x86_64.rpm -FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5 MAINTAINER "Yaoqi Wan " diff --git a/build/docker/Dockerfile.climc b/build/docker/Dockerfile.climc index a0e0a5d988..0d5329d2b8 100644 --- a/build/docker/Dockerfile.climc +++ b/build/docker/Dockerfile.climc @@ -1,4 +1,4 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:20210701 +FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:20210817 ADD ./build/climc/root/opt /opt diff --git a/build/docker/Dockerfile.climc-base b/build/docker/Dockerfile.climc-base index 98ca03acc6..f025b0c1d6 100644 --- a/build/docker/Dockerfile.climc-base +++ b/build/docker/Dockerfile.climc-base @@ -1,4 +1,4 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5 MAINTAINER "Zexi Li " diff --git a/build/docker/Dockerfile.cloudevent b/build/docker/Dockerfile.cloudevent index 542765a5fd..8e91132f30 100644 --- a/build/docker/Dockerfile.cloudevent +++ b/build/docker/Dockerfile.cloudevent @@ -1,3 +1,3 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5 -ADD ./_output/alpine-build/bin/cloudevent /opt/yunion/bin/cloudevent \ No newline at end of file +ADD ./_output/alpine-build/bin/cloudevent /opt/yunion/bin/cloudevent diff --git a/build/docker/Dockerfile.cloudid b/build/docker/Dockerfile.cloudid index c23025fed1..2b48b9fbf9 100644 --- a/build/docker/Dockerfile.cloudid +++ b/build/docker/Dockerfile.cloudid @@ -1,4 +1,4 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5 COPY ./build/cloudid/root/opt/ /opt/ ADD ./_output/alpine-build/bin/cloudid /opt/yunion/bin/cloudid diff --git a/build/docker/Dockerfile.cloudmon b/build/docker/Dockerfile.cloudmon index a870d09d3b..50148c1e78 100644 --- a/build/docker/Dockerfile.cloudmon +++ b/build/docker/Dockerfile.cloudmon @@ -1,4 +1,4 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5 MAINTAINER "Zexi Li " diff --git a/build/docker/Dockerfile.cloudnet b/build/docker/Dockerfile.cloudnet index efcd090d17..c729b1ad1d 100644 --- a/build/docker/Dockerfile.cloudnet +++ b/build/docker/Dockerfile.cloudnet @@ -1,3 +1,3 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5 -ADD ./_output/alpine-build/bin/cloudnet /opt/yunion/bin/cloudnet \ No newline at end of file +ADD ./_output/alpine-build/bin/cloudnet /opt/yunion/bin/cloudnet diff --git a/build/docker/Dockerfile.cloudproxy b/build/docker/Dockerfile.cloudproxy index 8e22d321b8..f6718892ab 100644 --- a/build/docker/Dockerfile.cloudproxy +++ b/build/docker/Dockerfile.cloudproxy @@ -1,3 +1,3 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5 ADD ./_output/alpine-build/bin/cloudproxy /opt/yunion/bin/cloudproxy diff --git a/build/docker/Dockerfile.devtool b/build/docker/Dockerfile.devtool index 3f55105d04..94ddf65abb 100644 --- a/build/docker/Dockerfile.devtool +++ b/build/docker/Dockerfile.devtool @@ -1,3 +1,3 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5 -ADD ./_output/alpine-build/bin/devtool /opt/yunion/bin/devtool \ No newline at end of file +ADD ./_output/alpine-build/bin/devtool /opt/yunion/bin/devtool diff --git a/build/docker/Dockerfile.esxi-agent b/build/docker/Dockerfile.esxi-agent index 1c34ebe5c3..19b21c3b05 100644 --- a/build/docker/Dockerfile.esxi-agent +++ b/build/docker/Dockerfile.esxi-agent @@ -1,4 +1,4 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5 COPY ./build/esxi-agent/root/opt/ /opt/ diff --git a/build/docker/Dockerfile.keystone b/build/docker/Dockerfile.keystone index 1aad4b3dbb..623948e281 100644 --- a/build/docker/Dockerfile.keystone +++ b/build/docker/Dockerfile.keystone @@ -1,3 +1,3 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5 -ADD ./_output/alpine-build/bin/keystone /opt/yunion/bin/keystone \ No newline at end of file +ADD ./_output/alpine-build/bin/keystone /opt/yunion/bin/keystone diff --git a/build/docker/Dockerfile.logger b/build/docker/Dockerfile.logger index 7df9a5cde5..dce1e26c46 100644 --- a/build/docker/Dockerfile.logger +++ b/build/docker/Dockerfile.logger @@ -1,3 +1,3 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5 ADD ./_output/alpine-build/bin/logger /opt/yunion/bin/logger diff --git a/build/docker/Dockerfile.monitor b/build/docker/Dockerfile.monitor index 8aecbe2f33..cea58ef3fe 100644 --- a/build/docker/Dockerfile.monitor +++ b/build/docker/Dockerfile.monitor @@ -1,4 +1,4 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5 COPY ./build/monitor/root/opt/ /opt/ -ADD ./_output/alpine-build/bin/monitor /opt/yunion/bin/monitor \ No newline at end of file +ADD ./_output/alpine-build/bin/monitor /opt/yunion/bin/monitor diff --git a/build/docker/Dockerfile.notify b/build/docker/Dockerfile.notify index 7d72d0a96c..03aa01552d 100644 --- a/build/docker/Dockerfile.notify +++ b/build/docker/Dockerfile.notify @@ -1,4 +1,4 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5 COPY ./build/notify/root/opt/ /opt/ ADD ./_output/alpine-build/bin/notify /opt/yunion/bin/notify diff --git a/build/docker/Dockerfile.region b/build/docker/Dockerfile.region index 89b9e141a3..7ba240a0c2 100644 --- a/build/docker/Dockerfile.region +++ b/build/docker/Dockerfile.region @@ -1,4 +1,4 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5 COPY ./build/region/root/opt/ /opt/ ADD ./_output/alpine-build/bin/region /opt/yunion/bin/region diff --git a/build/docker/Dockerfile.region-dns b/build/docker/Dockerfile.region-dns index bd641a370d..a778c73679 100644 --- a/build/docker/Dockerfile.region-dns +++ b/build/docker/Dockerfile.region-dns @@ -1,4 +1,4 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5 RUN mkdir -p /opt/yunion/bin ADD ./_output/alpine-build/bin/region-dns /opt/yunion/bin/region-dns diff --git a/build/docker/Dockerfile.s3gateway b/build/docker/Dockerfile.s3gateway index 1257a0b666..6d039409e0 100644 --- a/build/docker/Dockerfile.s3gateway +++ b/build/docker/Dockerfile.s3gateway @@ -1,3 +1,3 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5 -ADD ./_output/alpine-build/bin/s3gateway /opt/yunion/bin/s3gateway \ No newline at end of file +ADD ./_output/alpine-build/bin/s3gateway /opt/yunion/bin/s3gateway diff --git a/build/docker/Dockerfile.scheduler b/build/docker/Dockerfile.scheduler index ed129de1ba..31aaa26778 100644 --- a/build/docker/Dockerfile.scheduler +++ b/build/docker/Dockerfile.scheduler @@ -1,3 +1,3 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5 -ADD ./_output/alpine-build/bin/scheduler /opt/yunion/bin/scheduler \ No newline at end of file +ADD ./_output/alpine-build/bin/scheduler /opt/yunion/bin/scheduler diff --git a/build/docker/Dockerfile.yunionconf b/build/docker/Dockerfile.yunionconf index 34c47b701a..b2ce52e6aa 100644 --- a/build/docker/Dockerfile.yunionconf +++ b/build/docker/Dockerfile.yunionconf @@ -1,3 +1,3 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5 ADD ./_output/alpine-build/bin/yunionconf /opt/yunion/bin/yunionconf diff --git a/build/docker/Makefile b/build/docker/Makefile index fb6bb214a8..ed8bbbb5de 100644 --- a/build/docker/Makefile +++ b/build/docker/Makefile @@ -12,7 +12,12 @@ ONECLOUD_BASE_VERSION = v0.3.5 onecloud-base: $(DOCKER_BUILDX)/onecloud-base:$(ONECLOUD_BASE_VERSION) -f ./Dockerfile.onecloud-base . -CLIMC_BASE_VERSION = 20210701 +ANSIBLESERVER_BASE = v1.0.5 + +ansibleserver-base: + $(DOCKER_BUILDX)/ansibleserver-base:$(ANSIBLESERVER_BASE) -f ./Dockerfile.ansibleserver-base . + +CLIMC_BASE_VERSION = 20210817 climc-base: docker buildx build --platform linux/arm64,linux/amd64 --push \