From 3f1e6da1d795ffdd460fb1ff6ca19fb0a30ec971 Mon Sep 17 00:00:00 2001 From: Nikolay Date: Fri, 24 Sep 2021 00:14:11 +0300 Subject: [PATCH] moves prod images build into alpine container with musl (#1640) adds gcc and musl-dev to builder container --- deployment/docker/Makefile | 4 ++-- deployment/docker/builder/Dockerfile | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/deployment/docker/Makefile b/deployment/docker/Makefile index 0315d2e35c..61b8593876 100644 --- a/deployment/docker/Makefile +++ b/deployment/docker/Makefile @@ -4,7 +4,7 @@ DOCKER_NAMESPACE := victoriametrics ROOT_IMAGE ?= alpine:3.14.2 CERTS_IMAGE := alpine:3.14.2 -GO_BUILDER_IMAGE := golang:1.17.1 +GO_BUILDER_IMAGE := golang:1.17.1-alpine BUILDER_IMAGE := local/builder:2.0.0-$(shell echo $(GO_BUILDER_IMAGE) | tr : _) BASE_IMAGE := local/base:1.1.3-$(shell echo $(ROOT_IMAGE) | tr : _)-$(shell echo $(CERTS_IMAGE) | tr : _) @@ -36,7 +36,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 musl' \ -o bin/$(APP_NAME)$(APP_SUFFIX)-prod $(PKG_PREFIX)/app/$(APP_NAME) app-via-docker-windows: package-builder diff --git a/deployment/docker/builder/Dockerfile b/deployment/docker/builder/Dockerfile index d156d4248f..c3af52c503 100644 --- a/deployment/docker/builder/Dockerfile +++ b/deployment/docker/builder/Dockerfile @@ -1,3 +1,4 @@ ARG go_builder_image FROM $go_builder_image STOPSIGNAL SIGINT +RUN apk add gcc musl-dev make --no-cache \ No newline at end of file