From 17ce776944d716d26ccef26462b270c50714ae7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Wed, 27 Jan 2021 16:46:38 +0100 Subject: [PATCH 1/4] Use *-static packages in alpine dockerfile And remove unnecessary *-dev because they're already dependencies of *-static --- docker/alpine.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/alpine.Dockerfile b/docker/alpine.Dockerfile index 64063a5a..c91aa12f 100644 --- a/docker/alpine.Dockerfile +++ b/docker/alpine.Dockerfile @@ -5,7 +5,7 @@ RUN \ # core dependencies gc-dev gcc gmp-dev libatomic_ops libevent-static musl-dev pcre-dev \ # stdlib dependencies - libxml2-dev openssl-dev openssl-libs-static tzdata yaml-dev zlib-static \ + libxml2-dev openssl-libs-static tzdata yaml-static zlib-static \ # dev tools make git @@ -31,6 +31,6 @@ FROM runtime as build RUN \ apk add --update --no-cache --force-overwrite \ - llvm10-dev llvm10-static g++ + llvm10-static g++ CMD ["/bin/sh"] From 1ebf5c1ca4cea0b9f426a346389cb1934682aa2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Wed, 27 Jan 2021 16:36:19 +0100 Subject: [PATCH 2/4] Update alpine dockerfile to 3.13 --- docker/alpine.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/alpine.Dockerfile b/docker/alpine.Dockerfile index c91aa12f..ba0c1af4 100644 --- a/docker/alpine.Dockerfile +++ b/docker/alpine.Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.12 as runtime +FROM alpine:3.13 as runtime RUN \ apk add --update --no-cache --force-overwrite \ From 04a2d23996c344c4ca4ef1e4505d60be05dc85dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Wed, 27 Jan 2021 16:44:07 +0100 Subject: [PATCH 3/4] Remove unnecessary package llvm10-dev in linux Dockerfile Included in llvm10-static --- linux/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Dockerfile b/linux/Dockerfile index 437a833e..1e15f4c1 100644 --- a/linux/Dockerfile +++ b/linux/Dockerfile @@ -43,7 +43,7 @@ RUN sed -i 's|--list -- "$@"|--list "$@"|' /usr/bin/ldd # Install dependencies RUN apk add --no-cache \ # Statically-compiled llvm - llvm10-dev llvm10-static \ + llvm10-static \ # Static zlib, libyaml, libxml2, pcre, and libevent zlib-static yaml-static libxml2-dev pcre-dev libevent-static \ # Build tools From 43ddd83c96dd59d52ddb69e7b0dacc3649ecb5d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Wed, 27 Jan 2021 17:09:16 +0100 Subject: [PATCH 4/4] Update linux build image to alpine:3.13 --- linux/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Makefile b/linux/Makefile index d516aad8..ff6699ba 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -48,14 +48,14 @@ BUILD_ARGS_COMMON = $(DOCKER_BUILD_ARGS) \ BUILD_ARGS64 = $(BUILD_ARGS_COMMON) \ --build-arg previous_crystal_release=$(PREVIOUS_CRYSTAL_RELEASE_LINUX64_TARGZ) \ --build-arg debian_image=debian:10 \ - --build-arg alpine_image=alpine:3.12 \ + --build-arg alpine_image=alpine:3.13 \ --build-arg musl_target=x86_64-linux-musl \ --build-arg gnu_target=x86_64-unknown-linux-gnu BUILD_ARGS32 = $(BUILD_ARGS_COMMON) \ --build-arg previous_crystal_release=$(PREVIOUS_CRYSTAL_RELEASE_LINUX32_TARGZ) \ --build-arg debian_image=i386/debian:10 \ - --build-arg alpine_image=i386/alpine:3.12 \ + --build-arg alpine_image=i386/alpine:3.13 \ --build-arg musl_target=i686-linux-musl \ --build-arg gnu_target=i686-unknown-linux-gnu