diff --git a/build/docker/Dockerfile.ansibleserver b/build/docker/Dockerfile.ansibleserver index 22de3d416b..4539f5eb16 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.5 +FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:v1.0.5-2 # install playbook and telegraf install pkg COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.3.4 /opt/yunion/playbook /opt/yunion/playbook diff --git a/build/docker/Dockerfile.ansibleserver-base b/build/docker/Dockerfile.ansibleserver-base index ac14df6e69..2e627f5244 100644 --- a/build/docker/Dockerfile.ansibleserver-base +++ b/build/docker/Dockerfile.ansibleserver-base @@ -2,6 +2,8 @@ FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5 MAINTAINER "Yousong Zhou " +ENV TZ UTC + # openssh-client, for ansible ssh connection # git, ca-certificates, for fetching ansible roles RUN set -x \ diff --git a/build/docker/Dockerfile.apigateway b/build/docker/Dockerfile.apigateway index 9145dadd6d..1fc32ddda8 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.3.5 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1 ADD ./_output/alpine-build/bin/apigateway /opt/yunion/bin/apigateway diff --git a/build/docker/Dockerfile.baremetal-agent b/build/docker/Dockerfile.baremetal-agent index d8d7decf95..a3d7fe3deb 100644 --- a/build/docker/Dockerfile.baremetal-agent +++ b/build/docker/Dockerfile.baremetal-agent @@ -8,4 +8,5 @@ RUN mkdir -p /opt/yunion/bin #ADD ./_output/bin/.baremetal-agent.bin /opt/yunion/bin/.baremetal-agent.bin #ADD ./_output/bin/bundles/baremetal-agent /opt/yunion/bin/bundles/baremetal-agent RUN apk add librados librbd +ENV TZ UTC ADD ./_output/alpine-build/bin/baremetal-agent /opt/yunion/bin/baremetal-agent diff --git a/build/docker/Dockerfile.baremetal-base b/build/docker/Dockerfile.baremetal-base index 597df06e58..89b1fa75ef 100644 --- a/build/docker/Dockerfile.baremetal-base +++ b/build/docker/Dockerfile.baremetal-base @@ -12,8 +12,6 @@ RUN apk update && \ apk add --no-cache ipmitool ethtool tzdata ca-certificates cdrkit coreutils && \ rm -rf /var/cache/apk/* -RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime - RUN mkdir -p /opt/cloud/yunion/baremetal # udpate latest pci.ids diff --git a/build/docker/Dockerfile.cloudevent b/build/docker/Dockerfile.cloudevent index 8e91132f30..5b737d41f6 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.3.5 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1 ADD ./_output/alpine-build/bin/cloudevent /opt/yunion/bin/cloudevent diff --git a/build/docker/Dockerfile.cloudid b/build/docker/Dockerfile.cloudid index 2b48b9fbf9..4cd38eaa6a 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.3.5 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1 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 579086785f..51e5b24552 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.3.5 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1 MAINTAINER "Zexi Li " diff --git a/build/docker/Dockerfile.cloudnet b/build/docker/Dockerfile.cloudnet index c729b1ad1d..6db178e379 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.3.5 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1 ADD ./_output/alpine-build/bin/cloudnet /opt/yunion/bin/cloudnet diff --git a/build/docker/Dockerfile.cloudproxy b/build/docker/Dockerfile.cloudproxy index f6718892ab..1283403737 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.3.5 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1 ADD ./_output/alpine-build/bin/cloudproxy /opt/yunion/bin/cloudproxy diff --git a/build/docker/Dockerfile.devtool b/build/docker/Dockerfile.devtool index 94ddf65abb..8a89d5fd5d 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.3.5 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1 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 19b21c3b05..3f71ba6873 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.3.5 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1 COPY ./build/esxi-agent/root/opt/ /opt/ diff --git a/build/docker/Dockerfile.glance b/build/docker/Dockerfile.glance index dc506fe9a5..a8aa52b452 100644 --- a/build/docker/Dockerfile.glance +++ b/build/docker/Dockerfile.glance @@ -3,5 +3,6 @@ FROM registry.cn-beijing.aliyuncs.com/yunionio/torrent:20210815.0 MAINTAINER "Zexi Li " RUN apk add --no-cache s3fs-fuse --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing +ENV TZ UTC RUN mkdir -p /opt/yunion/bin ADD ./_output/alpine-build/bin/glance /opt/yunion/bin/glance diff --git a/build/docker/Dockerfile.host b/build/docker/Dockerfile.host index 26c003bf62..7ce28879bf 100644 --- a/build/docker/Dockerfile.host +++ b/build/docker/Dockerfile.host @@ -2,7 +2,7 @@ FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.4.0 MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com" -ENV TZ Asia/Shanghai +ENV TZ UTC RUN mkdir -p /opt/yunion/bin ADD ./_output/alpine-build/bin/host /opt/yunion/bin/host diff --git a/build/docker/Dockerfile.host-deployer b/build/docker/Dockerfile.host-deployer index 1be3282bbc..f2c6d43d00 100644 --- a/build/docker/Dockerfile.host-deployer +++ b/build/docker/Dockerfile.host-deployer @@ -2,7 +2,7 @@ FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base:1.1 MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com" -ENV TZ Asia/Shanghai +ENV TZ UTC RUN mkdir -p /opt/yunion/bin diff --git a/build/docker/Dockerfile.keystone b/build/docker/Dockerfile.keystone index 623948e281..024eebbd9c 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.3.5 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1 ADD ./_output/alpine-build/bin/keystone /opt/yunion/bin/keystone diff --git a/build/docker/Dockerfile.logger b/build/docker/Dockerfile.logger index dce1e26c46..ef38311bbb 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.3.5 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1 ADD ./_output/alpine-build/bin/logger /opt/yunion/bin/logger diff --git a/build/docker/Dockerfile.monitor b/build/docker/Dockerfile.monitor index cea58ef3fe..4a656d7709 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.3.5 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1 COPY ./build/monitor/root/opt/ /opt/ ADD ./_output/alpine-build/bin/monitor /opt/yunion/bin/monitor diff --git a/build/docker/Dockerfile.notify b/build/docker/Dockerfile.notify index 03aa01552d..ed2962fb9c 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.3.5 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1 COPY ./build/notify/root/opt/ /opt/ ADD ./_output/alpine-build/bin/notify /opt/yunion/bin/notify diff --git a/build/docker/Dockerfile.onecloud-base b/build/docker/Dockerfile.onecloud-base index 21aec573f1..e44f907c7c 100644 --- a/build/docker/Dockerfile.onecloud-base +++ b/build/docker/Dockerfile.onecloud-base @@ -3,12 +3,10 @@ FROM alpine:3.13.5 MAINTAINER "Zexi Li " -ENV TZ Asia/Shanghai +ENV TZ UTC RUN mkdir -p /opt/yunion/bin RUN apk update && \ apk add --no-cache tzdata curl busybox-extras tcpdump strace ca-certificates && \ rm -rf /var/cache/apk/* - -RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime diff --git a/build/docker/Dockerfile.region b/build/docker/Dockerfile.region index 7ba240a0c2..ef02926caa 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.3.5 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1 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 a778c73679..6f11b94a11 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.3.5 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1 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 6d039409e0..2f656f2920 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.3.5 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1 ADD ./_output/alpine-build/bin/s3gateway /opt/yunion/bin/s3gateway diff --git a/build/docker/Dockerfile.scheduledtask b/build/docker/Dockerfile.scheduledtask index 9157ce04ff..7b7ad5ab00 100644 --- a/build/docker/Dockerfile.scheduledtask +++ b/build/docker/Dockerfile.scheduledtask @@ -1,3 +1,3 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1 ADD ./_output/alpine-build/bin/scheduledtask /opt/yunion/bin/scheduledtask diff --git a/build/docker/Dockerfile.scheduler b/build/docker/Dockerfile.scheduler index 31aaa26778..1a70b8a657 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.3.5 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1 ADD ./_output/alpine-build/bin/scheduler /opt/yunion/bin/scheduler diff --git a/build/docker/Dockerfile.torrent b/build/docker/Dockerfile.torrent index 0c69009a22..c164c7de81 100644 --- a/build/docker/Dockerfile.torrent +++ b/build/docker/Dockerfile.torrent @@ -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:v0.3.5-1 MAINTAINER "Zexi Li " diff --git a/build/docker/Dockerfile.vpcagent b/build/docker/Dockerfile.vpcagent index b906dbfefc..996b6d044c 100644 --- a/build/docker/Dockerfile.vpcagent +++ b/build/docker/Dockerfile.vpcagent @@ -2,5 +2,6 @@ FROM registry.cn-beijing.aliyuncs.com/yunionio/openvswitch:2.10.5-1 MAINTAINER "Yousong Zhou " +ENV TZ UTC RUN mkdir -p /opt/yunion/bin ADD ./_output/alpine-build/bin/vpcagent /opt/yunion/bin/vpcagent diff --git a/build/docker/Dockerfile.webconsole b/build/docker/Dockerfile.webconsole index a1b41943f4..41e773d56f 100644 --- a/build/docker/Dockerfile.webconsole +++ b/build/docker/Dockerfile.webconsole @@ -1,3 +1,3 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/webconsole-base:v0.2 +FROM registry.cn-beijing.aliyuncs.com/yunionio/webconsole-base:v0.2-1 -ADD ./_output/alpine-build/bin/webconsole /opt/yunion/bin/webconsole \ No newline at end of file +ADD ./_output/alpine-build/bin/webconsole /opt/yunion/bin/webconsole diff --git a/build/docker/Dockerfile.webconsole-base b/build/docker/Dockerfile.webconsole-base index 3efe1b8905..5279da82eb 100644 --- a/build/docker/Dockerfile.webconsole-base +++ b/build/docker/Dockerfile.webconsole-base @@ -2,11 +2,9 @@ FROM registry.cn-beijing.aliyuncs.com/yunionio/kubectl:1.18.6 MAINTAINER "Zexi Li " -ENV TZ Asia/Shanghai +ENV TZ UTC RUN mkdir -p /opt/yunion/bin RUN apk add --no-cache sshpass ipmitool openssh-client tzdata ca-certificates && \ rm -rf /var/cache/apk/* - -RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime diff --git a/build/docker/Dockerfile.yunionconf b/build/docker/Dockerfile.yunionconf index b2ce52e6aa..4da2499db6 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.3.5 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1 ADD ./_output/alpine-build/bin/yunionconf /opt/yunion/bin/yunionconf diff --git a/build/docker/Makefile b/build/docker/Makefile index 05bd3da8e8..8cd4283d93 100644 --- a/build/docker/Makefile +++ b/build/docker/Makefile @@ -7,12 +7,12 @@ debian10-base: docker buildx build --platform linux/arm64,linux/amd64 --push \ -t registry.cn-beijing.aliyuncs.com/yunionio/debian10-base:1.0 -f ./Dockerfile.debian-base . -ONECLOUD_BASE_VERSION = v0.3.5 +ONECLOUD_BASE_VERSION = v0.3.5-1 onecloud-base: $(DOCKER_BUILDX)/onecloud-base:$(ONECLOUD_BASE_VERSION) -f ./Dockerfile.onecloud-base . -ANSIBLESERVER_BASE = v1.0.5 +ANSIBLESERVER_BASE = v1.0.5-2 ansibleserver-base: $(DOCKER_BUILDX)/ansibleserver-base:$(ANSIBLESERVER_BASE) -f ./Dockerfile.ansibleserver-base . @@ -23,6 +23,10 @@ climc-base: docker buildx build --platform linux/arm64,linux/amd64 --push \ -t registry.cn-beijing.aliyuncs.com/yunionio/climc-base:$(CLIMC_BASE_VERSION) -f ./Dockerfile.climc-base . +WEBCONSOLE_BASE_VERSION = v0.2-1 +webconsole-base: + $(DOCKER_BUILDX)/webconsole-base:$(WEBCONSOLE_BASE_VERSION) -f ./Dockerfile.webconsole-base . + BAREMETAL_BASE_VERSION = v0.3.3 baremetal-base: