opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-29 17:58:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12803 from zexi/docker-image-unify-utc

Browse Source 
fix(build): unify docker image UTC timezone
This commit is contained in:
Zexi Li
2021-12-03 11:36:12 +08:00
committed by GitHub
parent 8b06cbd9e3 67aea1add2
commit dca6a87957
31 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/docker/Dockerfile.ansibleserver
+1 -1
View File
@@ -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
build/docker/Dockerfile.ansibleserver-base
+2
View File
@@ -2,6 +2,8 @@ FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
MAINTAINER "Yousong Zhou <zhouyousong@yunionyun.com>"
ENV TZ UTC
# openssh-client, for ansible ssh connection
# git, ca-certificates, for fetching ansible roles
RUN set -x \
build/docker/Dockerfile.apigateway
+1 -1
View File
@@ -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
build/docker/Dockerfile.baremetal-agent
+1
View File
@@ -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
build/docker/Dockerfile.baremetal-base
-2
View File
@@ -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
build/docker/Dockerfile.cloudevent
+1 -1
View File
@@ -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
build/docker/Dockerfile.cloudid
+1 -1
View File
@@ -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
build/docker/Dockerfile.cloudmon
+1 -1
View File
@@ -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 <lizexi@yunionyun.com>"
build/docker/Dockerfile.cloudnet
+1 -1
View File
@@ -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
build/docker/Dockerfile.cloudproxy
+1 -1
View File
@@ -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
build/docker/Dockerfile.devtool
+1 -1
View File
@@ -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
build/docker/Dockerfile.esxi-agent
+1 -1
View File
@@ -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/
build/docker/Dockerfile.glance
+1
View File
@@ -3,5 +3,6 @@ FROM registry.cn-beijing.aliyuncs.com/yunionio/torrent:20210815.0
MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
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
build/docker/Dockerfile.host
+1 -1
View File
@@ -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
build/docker/Dockerfile.host-deployer
+1 -1
View File
@@ -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
build/docker/Dockerfile.keystone
+1 -1
View File
@@ -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
build/docker/Dockerfile.logger
+1 -1
View File
@@ -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
build/docker/Dockerfile.monitor
+1 -1
View File
@@ -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
build/docker/Dockerfile.notify
+1 -1
View File
@@ -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
build/docker/Dockerfile.onecloud-base
+1 -3
View File
@@ -3,12 +3,10 @@ FROM alpine:3.13.5
MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
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
build/docker/Dockerfile.region
+1 -1
View File
@@ -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
build/docker/Dockerfile.region-dns
+1 -1
View File
@@ -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
build/docker/Dockerfile.s3gateway
+1 -1
View File
@@ -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
build/docker/Dockerfile.scheduledtask
+1 -1
View File
@@ -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
build/docker/Dockerfile.scheduler
+1 -1
View File
@@ -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
build/docker/Dockerfile.torrent
+1 -1
View File
@@ -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 <zexi.li@icloud.com>"
build/docker/Dockerfile.vpcagent
+1
View File
@@ -2,5 +2,6 @@ FROM registry.cn-beijing.aliyuncs.com/yunionio/openvswitch:2.10.5-1
MAINTAINER "Yousong Zhou <zhouyousong@yunion.cn>"
ENV TZ UTC
RUN mkdir -p /opt/yunion/bin
ADD ./_output/alpine-build/bin/vpcagent /opt/yunion/bin/vpcagent
build/docker/Dockerfile.webconsole
+2 -2
View File
@@ -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
ADD ./_output/alpine-build/bin/webconsole /opt/yunion/bin/webconsole
build/docker/Dockerfile.webconsole-base
+1 -3
View File
@@ -2,11 +2,9 @@ FROM registry.cn-beijing.aliyuncs.com/yunionio/kubectl:1.18.6
MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
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
build/docker/Dockerfile.yunionconf
+1 -1
View File
@@ -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
build/docker/Makefile
+6 -2
View File
@@ -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: