File tree Expand file tree Collapse file tree 3 files changed +7
-6
lines changed Expand file tree Collapse file tree 3 files changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ GC_VERSION = v8.2.0
18
18
19
19
OUTPUT_DIR := build
20
20
BUILD_CONTEXT := $(CURDIR ) /build-context
21
- BUILD_ARGS_UBUNTU64 := --build-arg crystal_targz=crystal.tar.gz $(BUILD_CONTEXT ) /ubuntu64 --build-arg base_docker_image=ubuntu:focal
21
+ BUILD_ARGS_UBUNTU64 := --build-arg crystal_targz=crystal.tar.gz $(BUILD_CONTEXT ) /ubuntu64
22
22
BUILD_ARGS_ALPINE := --build-arg crystal_targz=crystal.tar.gz $(BUILD_CONTEXT ) /alpine --build-arg gc_version=$(GC_VERSION )
23
23
DOCKER_TAG_UBUNTU := $(DOCKER_REPOSITORY ) :$(DOCKER_TAG )
24
24
DOCKER_TAG_ALPINE := $(DOCKER_REPOSITORY ) :$(DOCKER_TAG ) -alpine
Original file line number Diff line number Diff line change 1
- FROM alpine:3.16 as runtime
1
+ ARG base_docker_image=alpine:3.17
2
+ FROM ${base_docker_image} as runtime
2
3
3
4
RUN \
4
5
apk add --update --no-cache --force-overwrite \
@@ -42,6 +43,6 @@ FROM runtime as build
42
43
43
44
RUN \
44
45
apk add --update --no-cache --force-overwrite \
45
- llvm13 -dev llvm13 -static g++ libffi-dev
46
+ llvm15 -dev llvm15 -static g++ libffi-dev
46
47
47
48
CMD ["/bin/sh" ]
Original file line number Diff line number Diff line change 1
- ARG base_docker_image
1
+ ARG base_docker_image=ubuntu:22.04
2
2
FROM ${base_docker_image} as runtime
3
3
4
4
RUN \
@@ -23,9 +23,9 @@ FROM runtime as build
23
23
24
24
RUN \
25
25
apt-get update && \
26
- apt-get install -y build-essential llvm-10 lld-10 libedit-dev gdb libffi-dev && \
26
+ apt-get install -y build-essential llvm-15 lld-15 libedit-dev gdb libffi-dev && \
27
27
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
28
28
29
- RUN ln -sf /usr/bin/ld.lld-10 /usr/bin/ld.lld
29
+ RUN ln -sf /usr/bin/ld.lld-15 /usr/bin/ld.lld
30
30
31
31
CMD ["/bin/sh" ]
You can’t perform that action at this time.
0 commit comments