diff --git a/build/docker/Dockerfile.baremetal-agent b/build/docker/Dockerfile.baremetal-agent index d97f60de3d..5cfe6b6401 100644 --- a/build/docker/Dockerfile.baremetal-agent +++ b/build/docker/Dockerfile.baremetal-agent @@ -7,8 +7,10 @@ ENV TZ Asia/Shanghai RUN mkdir -p /opt/yunion/bin RUN apk update && \ - apk add --no-cache ipmitool ethtool && \ + apk add --no-cache ipmitool ethtool tzdata && \ rm -rf /var/cache/apk/* +RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime + ADD ./_output/bin/baremetal-agent /opt/yunion/bin/baremetal-agent diff --git a/build/docker/Dockerfile.climc b/build/docker/Dockerfile.climc index 8275f14edd..6283147c1e 100644 --- a/build/docker/Dockerfile.climc +++ b/build/docker/Dockerfile.climc @@ -4,7 +4,10 @@ MAINTAINER "Zexi Li " ENV TZ Asia/Shanghai -RUN apk add bash bash-completion +RUN apk add --no-cache bash bash-completion && \ + rm -rf /var/cache/apk/* + +RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime ENV PATH="/opt/yunion/bin:${PATH}" diff --git a/build/docker/Dockerfile.keystone b/build/docker/Dockerfile.keystone index 96d8db0964..0f95f75105 100644 --- a/build/docker/Dockerfile.keystone +++ b/build/docker/Dockerfile.keystone @@ -4,6 +4,12 @@ MAINTAINER "Zexi Li " ENV TZ Asia/Shanghai +RUN apk update && \ + apk add --no-cache tzdata ca-certificates && \ + rm -rf /var/cache/apk/* + +RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime + RUN mkdir -p /opt/yunion/bin ADD ./_output/bin/keystone /opt/yunion/bin/keystone diff --git a/build/docker/Dockerfile.logger b/build/docker/Dockerfile.logger index 461829e597..1c212ea1a9 100644 --- a/build/docker/Dockerfile.logger +++ b/build/docker/Dockerfile.logger @@ -4,6 +4,12 @@ MAINTAINER "Zexi Li " ENV TZ Asia/Shanghai +RUN apk update && \ + apk add --no-cache tzdata ca-certificates && \ + rm -rf /var/cache/apk/* + +RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime + RUN mkdir -p /opt/yunion/bin ADD ./_output/bin/logger /opt/yunion/bin/logger diff --git a/build/docker/Dockerfile.region b/build/docker/Dockerfile.region index b72bc702c8..11c13277d2 100644 --- a/build/docker/Dockerfile.region +++ b/build/docker/Dockerfile.region @@ -2,6 +2,12 @@ FROM alpine:3.8 MAINTAINER "Zexi Li " +RUN apk update && \ + apk add --no-cache tzdata ca-certificates && \ + rm -rf /var/cache/apk/* + +RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime + ENV TZ Asia/Shanghai RUN mkdir -p /opt/yunion/bin diff --git a/build/docker/Dockerfile.scheduler b/build/docker/Dockerfile.scheduler index 43b569cd4c..481faef3a4 100644 --- a/build/docker/Dockerfile.scheduler +++ b/build/docker/Dockerfile.scheduler @@ -4,6 +4,12 @@ MAINTAINER "Zexi Li " ENV TZ Asia/Shanghai +RUN apk update && \ + apk add --no-cache tzdata ca-certificates && \ + rm -rf /var/cache/apk/* + +RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime + RUN mkdir -p /opt/yunion/bin ADD ./_output/bin/scheduler /opt/yunion/bin/scheduler diff --git a/build/docker/Dockerfile.webconsole b/build/docker/Dockerfile.webconsole index 8a45c8187e..b716aeccf5 100644 --- a/build/docker/Dockerfile.webconsole +++ b/build/docker/Dockerfile.webconsole @@ -6,6 +6,9 @@ ENV TZ Asia/Shanghai RUN mkdir -p /opt/yunion/bin -RUN apk add --no-cache sshpass ipmitool openssh-client +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 ADD ./_output/bin/webconsole /opt/yunion/bin/webconsole diff --git a/build/docker/Dockerfile.yunionconf b/build/docker/Dockerfile.yunionconf index 2e85d6c3b9..e944b3f5d5 100644 --- a/build/docker/Dockerfile.yunionconf +++ b/build/docker/Dockerfile.yunionconf @@ -4,6 +4,12 @@ MAINTAINER "Zexi Li " ENV TZ Asia/Shanghai +RUN apk update && \ + apk add --no-cache tzdata ca-certificates && \ + rm -rf /var/cache/apk/* + +RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime + RUN mkdir -p /opt/yunion/bin ADD ./_output/bin/yunionconf /opt/yunion/bin/yunionconf