Skip to content

Commit bdff883

Browse files
Fix alpine Dockerfile to add *-static packages and update to alpine 3.13 (#79)
* Use *-static packages in alpine dockerfile And remove unnecessary *-dev because they're already dependencies of *-static * Update alpine dockerfile to 3.13 * Remove unnecessary package llvm10-dev in linux Dockerfile Included in llvm10-static * Update linux build image to alpine:3.13
1 parent 80c83b2 commit bdff883

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

docker/alpine.Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM alpine:3.12 as runtime
1+
FROM alpine:3.13 as runtime
22

33
RUN \
44
apk add --update --no-cache --force-overwrite \
55
# core dependencies
66
gc-dev gcc gmp-dev libatomic_ops libevent-static musl-dev pcre-dev \
77
# stdlib dependencies
8-
libxml2-dev openssl-dev openssl-libs-static tzdata yaml-dev zlib-static \
8+
libxml2-dev openssl-libs-static tzdata yaml-static zlib-static \
99
# dev tools
1010
make git
1111

@@ -31,6 +31,6 @@ FROM runtime as build
3131

3232
RUN \
3333
apk add --update --no-cache --force-overwrite \
34-
llvm10-dev llvm10-static g++
34+
llvm10-static g++
3535

3636
CMD ["/bin/sh"]

linux/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ RUN sed -i 's|--list -- "$@"|--list "$@"|' /usr/bin/ldd
4343
# Install dependencies
4444
RUN apk add --no-cache \
4545
# Statically-compiled llvm
46-
llvm10-dev llvm10-static \
46+
llvm10-static \
4747
# Static zlib, libyaml, libxml2, pcre, and libevent
4848
zlib-static yaml-static libxml2-dev pcre-dev libevent-static \
4949
# Build tools

linux/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ BUILD_ARGS_COMMON = $(DOCKER_BUILD_ARGS) \
4848
BUILD_ARGS64 = $(BUILD_ARGS_COMMON) \
4949
--build-arg previous_crystal_release=$(PREVIOUS_CRYSTAL_RELEASE_LINUX64_TARGZ) \
5050
--build-arg debian_image=debian:10 \
51-
--build-arg alpine_image=alpine:3.12 \
51+
--build-arg alpine_image=alpine:3.13 \
5252
--build-arg musl_target=x86_64-linux-musl \
5353
--build-arg gnu_target=x86_64-unknown-linux-gnu
5454

5555
BUILD_ARGS32 = $(BUILD_ARGS_COMMON) \
5656
--build-arg previous_crystal_release=$(PREVIOUS_CRYSTAL_RELEASE_LINUX32_TARGZ) \
5757
--build-arg debian_image=i386/debian:10 \
58-
--build-arg alpine_image=i386/alpine:3.12 \
58+
--build-arg alpine_image=i386/alpine:3.13 \
5959
--build-arg musl_target=i686-linux-musl \
6060
--build-arg gnu_target=i686-unknown-linux-gnu
6161

0 commit comments

Comments
 (0)