Skip to content

Commit

Permalink
support time zone (harness#3241)
Browse files Browse the repository at this point in the history
  • Loading branch information
zc2638 authored Sep 13, 2022
1 parent a7bd561 commit d3dad57
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 7 deletions.
3 changes: 2 additions & 1 deletion docker/Dockerfile.agent.linux.amd64
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM alpine:3.11 as alpine
RUN apk add -U --no-cache ca-certificates
RUN apk add -U --no-cache ca-certificates tzdata

FROM alpine:3.11
ENV GODEBUG netdns=go
Expand All @@ -12,6 +12,7 @@ ADD release/linux/amd64/drone-agent /bin/
RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf

COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=alpine /usr/share/zoneinfo /usr/share/zoneinfo

LABEL com.centurylinklabs.watchtower.stop-signal="SIGINT"

Expand Down
3 changes: 2 additions & 1 deletion docker/Dockerfile.controller.linux.amd64
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM alpine:3.11 as alpine
RUN apk add -U --no-cache ca-certificates
RUN apk add -U --no-cache ca-certificates tzdata

FROM alpine:3.11
ENV GODEBUG netdns=go
Expand All @@ -10,5 +10,6 @@ ENV DRONE_RUNNER_CAPACITY=1
ADD release/linux/amd64/drone-controller /bin/

COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=alpine /usr/share/zoneinfo /usr/share/zoneinfo

ENTRYPOINT ["/bin/drone-controller"]
3 changes: 2 additions & 1 deletion docker/Dockerfile.controller.linux.arm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM alpine:3.11 as alpine
RUN apk add -U --no-cache ca-certificates
RUN apk add -U --no-cache ca-certificates tzdata

FROM alpine:3.11
ENV GODEBUG=netdns=go
Expand All @@ -11,5 +11,6 @@ ENV DRONE_RUNNER_VARIANT=v7
ADD release/linux/arm/drone-controller /bin/

COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=alpine /usr/share/zoneinfo /usr/share/zoneinfo

ENTRYPOINT ["/bin/drone-controller"]
3 changes: 2 additions & 1 deletion docker/Dockerfile.controller.linux.arm64
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM alpine:3.11 as alpine
RUN apk add -U --no-cache ca-certificates
RUN apk add -U --no-cache ca-certificates tzdata

FROM alpine:3.11
ENV GODEBUG=netdns=go
Expand All @@ -11,5 +11,6 @@ ENV DRONE_RUNNER_VARIANT=v8
ADD release/linux/arm64/drone-controller /bin/

COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=alpine /usr/share/zoneinfo /usr/share/zoneinfo

ENTRYPOINT ["/bin/drone-controller"]
3 changes: 2 additions & 1 deletion docker/Dockerfile.server.linux.amd64
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# docker build --rm -f docker/Dockerfile -t drone/drone .

FROM alpine:3.11 as alpine
RUN apk add -U --no-cache ca-certificates
RUN apk add -U --no-cache ca-certificates tzdata

FROM alpine:3.11
EXPOSE 80 443
Expand All @@ -21,6 +21,7 @@ ENV DRONE_DATADOG_ENABLED=true
ENV DRONE_DATADOG_ENDPOINT=https://stats.drone.ci/api/v1/series

COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=alpine /usr/share/zoneinfo /usr/share/zoneinfo

ADD release/linux/amd64/drone-server /bin/
ENTRYPOINT ["/bin/drone-server"]
3 changes: 2 additions & 1 deletion docker/Dockerfile.server.linux.arm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# docker build --rm -f docker/Dockerfile -t drone/drone .

FROM alpine:3.11 as alpine
RUN apk add -U --no-cache ca-certificates
RUN apk add -U --no-cache ca-certificates tzdata

FROM alpine:3.11
EXPOSE 80 443
Expand All @@ -21,6 +21,7 @@ ENV DRONE_DATADOG_ENABLED=true
ENV DRONE_DATADOG_ENDPOINT=https://stats.drone.ci/api/v1/series

COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=alpine /usr/share/zoneinfo /usr/share/zoneinfo

ADD release/linux/arm/drone-server /bin/
ENTRYPOINT ["/bin/drone-server"]
3 changes: 2 additions & 1 deletion docker/Dockerfile.server.linux.arm64
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# docker build --rm -f docker/Dockerfile -t drone/drone .

FROM alpine:3.11 as alpine
RUN apk add -U --no-cache ca-certificates
RUN apk add -U --no-cache ca-certificates tzdata

FROM alpine:3.11
EXPOSE 80 443
Expand All @@ -21,6 +21,7 @@ ENV DRONE_DATADOG_ENABLED=true
ENV DRONE_DATADOG_ENDPOINT=https://stats.drone.ci/api/v1/series

COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=alpine /usr/share/zoneinfo /usr/share/zoneinfo

ADD release/linux/arm64/drone-server /bin/
ENTRYPOINT ["/bin/drone-server"]

0 comments on commit d3dad57

Please sign in to comment.