Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix alpine Dockerfile to add *-static packages and update to alpine 3.13 #79

Merged
merged 4 commits into from
Jan 27, 2021
Merged

Fix alpine Dockerfile to add *-static packages and update to alpine 3.13 #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
17ce776
Use *-static packages in alpine dockerfile
straight-shoota Jan 27, 2021
1ebf5c1
Update alpine dockerfile to 3.13
straight-shoota Jan 27, 2021
04a2d23
Remove unnecessary package llvm10-dev in linux Dockerfile
straight-shoota Jan 27, 2021
43ddd83
Update linux build image to alpine:3.13
straight-shoota Jan 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docker/alpine.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM alpine:3.12 as runtime
FROM alpine:3.13 as runtime

RUN \
apk add --update --no-cache --force-overwrite \
# 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

Expand All @@ -31,6 +31,6 @@ FROM runtime as build

RUN \
apk add --update --no-cache --force-overwrite \
llvm10-dev llvm10-static g++
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is needed https://github.com/crystal-lang/crystal/pull/10318/checks?check_run_id=1779776162#step:5:43

llvm10-static g++

CMD ["/bin/sh"]
2 changes: 1 addition & 1 deletion linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions linux/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down