diff --git a/app/vmagent/multiarch/Dockerfile b/app/vmagent/multiarch/Dockerfile index 74a8ceb12..f074775a5 100644 --- a/app/vmagent/multiarch/Dockerfile +++ b/app/vmagent/multiarch/Dockerfile @@ -2,11 +2,10 @@ ARG certs_image ARG root_image FROM $certs_image as certs -RUN apk --update --no-cache add ca-certificates tzdata +RUN apk --update --no-cache add ca-certificates FROM $root_image COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY --from=certs /usr/share/zoneinfo /usr/share/zoneinfo/ EXPOSE 8429 ENTRYPOINT ["/vmagent-prod"] ARG TARGETARCH diff --git a/app/vmauth/multiarch/Dockerfile b/app/vmauth/multiarch/Dockerfile index 79be2563f..2f510fa6a 100644 --- a/app/vmauth/multiarch/Dockerfile +++ b/app/vmauth/multiarch/Dockerfile @@ -2,11 +2,10 @@ ARG certs_image ARG root_image FROM $certs_image as certs -RUN apk --update --no-cache add ca-certificates tzdata +RUN apk --update --no-cache add ca-certificates FROM $root_image COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY --from=certs /usr/share/zoneinfo /usr/share/zoneinfo/ EXPOSE 8427 ENTRYPOINT ["/vmauth-prod"] ARG TARGETARCH diff --git a/app/vmbackup/multiarch/Dockerfile b/app/vmbackup/multiarch/Dockerfile index 836a86a51..594b66c0f 100644 --- a/app/vmbackup/multiarch/Dockerfile +++ b/app/vmbackup/multiarch/Dockerfile @@ -2,11 +2,10 @@ ARG certs_image ARG root_image FROM $certs_image as certs -RUN apk --update --no-cache add ca-certificates tzdata +RUN apk --update --no-cache add ca-certificates FROM $root_image COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY --from=certs /usr/share/zoneinfo /usr/share/zoneinfo/ ENTRYPOINT ["/vmbackup-prod"] ARG TARGETARCH COPY vmbackup-${TARGETARCH}-prod ./vmbackup-prod diff --git a/app/vmctl/multiarch/Dockerfile b/app/vmctl/multiarch/Dockerfile index e05980d89..0db55b3be 100644 --- a/app/vmctl/multiarch/Dockerfile +++ b/app/vmctl/multiarch/Dockerfile @@ -2,11 +2,10 @@ ARG certs_image ARG root_image FROM $certs_image as certs -RUN apk --update --no-cache add ca-certificates tzdata +RUN apk --update --no-cache add ca-certificates FROM $root_image COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY --from=certs /usr/share/zoneinfo /usr/share/zoneinfo/ ENTRYPOINT ["/vmctl-prod"] ARG TARGETARCH COPY vmctl-${TARGETARCH}-prod ./vmctl-prod diff --git a/app/vminsert/multiarch/Dockerfile b/app/vminsert/multiarch/Dockerfile index 22fc47320..5e008187a 100644 --- a/app/vminsert/multiarch/Dockerfile +++ b/app/vminsert/multiarch/Dockerfile @@ -2,11 +2,10 @@ ARG certs_image ARG root_image FROM $certs_image as certs -RUN apk --update --no-cache add ca-certificates tzdata +RUN apk --update --no-cache add ca-certificates FROM $root_image COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY --from=certs /usr/share/zoneinfo /usr/share/zoneinfo/ EXPOSE 8480 ENTRYPOINT ["/vminsert-prod"] ARG TARGETARCH diff --git a/app/vmrestore/multiarch/Dockerfile b/app/vmrestore/multiarch/Dockerfile index 6ed44dd12..85fe70603 100644 --- a/app/vmrestore/multiarch/Dockerfile +++ b/app/vmrestore/multiarch/Dockerfile @@ -2,11 +2,10 @@ ARG certs_image ARG root_image FROM $certs_image as certs -RUN apk --update --no-cache add ca-certificates tzdata +RUN apk --update --no-cache add ca-certificates FROM $root_image COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY --from=certs /usr/share/zoneinfo /usr/share/zoneinfo/ ENTRYPOINT ["/vmrestore-prod"] ARG TARGETARCH COPY vmrestore-${TARGETARCH}-prod ./vmrestore-prod diff --git a/app/vmselect/multiarch/Dockerfile b/app/vmselect/multiarch/Dockerfile index acd3f5352..a6c170ef8 100644 --- a/app/vmselect/multiarch/Dockerfile +++ b/app/vmselect/multiarch/Dockerfile @@ -2,11 +2,10 @@ ARG certs_image ARG root_image FROM $certs_image as certs -RUN apk --update --no-cache add ca-certificates tzdata +RUN apk --update --no-cache add ca-certificates FROM $root_image COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY --from=certs /usr/share/zoneinfo /usr/share/zoneinfo/ EXPOSE 8481 ENTRYPOINT ["/vmselect-prod"] ARG TARGETARCH diff --git a/app/vmstorage/multiarch/Dockerfile b/app/vmstorage/multiarch/Dockerfile index 14ac62301..01c1a6660 100644 --- a/app/vmstorage/multiarch/Dockerfile +++ b/app/vmstorage/multiarch/Dockerfile @@ -2,11 +2,10 @@ ARG certs_image ARG root_image FROM $certs_image as certs -RUN apk --update --no-cache add ca-certificates tzdata +RUN apk --update --no-cache add ca-certificates FROM $root_image COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY --from=certs /usr/share/zoneinfo /usr/share/zoneinfo/ EXPOSE 8482 EXPOSE 8400 EXPOSE 8401 diff --git a/deployment/docker/Makefile b/deployment/docker/Makefile index c922e5d99..79a7aed56 100644 --- a/deployment/docker/Makefile +++ b/deployment/docker/Makefile @@ -6,7 +6,7 @@ ROOT_IMAGE ?= alpine:3.13.1 CERTS_IMAGE := alpine:3.13.1 GO_BUILDER_IMAGE := golang:1.15.8 BUILDER_IMAGE := local/builder:2.0.0-$(shell echo $(GO_BUILDER_IMAGE) | tr : _) -BASE_IMAGE := local/base:1.1.2-$(shell echo $(ROOT_IMAGE) | tr : _)-$(shell echo $(CERTS_IMAGE) | tr : _) +BASE_IMAGE := local/base:1.1.3-$(shell echo $(ROOT_IMAGE) | tr : _)-$(shell echo $(CERTS_IMAGE) | tr : _) package-base: (docker image ls --format '{{.Repository}}:{{.Tag}}' | grep -q '$(BASE_IMAGE)$$') \ @@ -34,7 +34,7 @@ app-via-docker: package-builder $(BUILDER_IMAGE) \ go build $(RACE) -mod=vendor -trimpath \ -ldflags "-extldflags '-static' $(GO_BUILDINFO)" \ - -tags 'netgo osusergo nethttpomithttp2' \ + -tags 'netgo osusergo nethttpomithttp2 timetzdata' \ -o bin/$(APP_NAME)$(APP_SUFFIX)-prod $(PKG_PREFIX)/app/$(APP_NAME) package-via-docker: package-base diff --git a/deployment/docker/base/Dockerfile b/deployment/docker/base/Dockerfile index 00419f0dd..376f8f16e 100644 --- a/deployment/docker/base/Dockerfile +++ b/deployment/docker/base/Dockerfile @@ -3,9 +3,8 @@ ARG certs_image ARG root_image FROM $certs_image as certs -RUN apk --update --no-cache add ca-certificates tzdata +RUN apk --update --no-cache add ca-certificates FROM $root_image COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY --from=certs /usr/share/zoneinfo /usr/share/zoneinfo/ \ No newline at end of file