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
1818
1919OUTPUT_DIR := build
2020BUILD_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
2222BUILD_ARGS_ALPINE := --build-arg crystal_targz=crystal.tar.gz $(BUILD_CONTEXT ) /alpine --build-arg gc_version=$(GC_VERSION )
2323DOCKER_TAG_UBUNTU := $(DOCKER_REPOSITORY ) :$(DOCKER_TAG )
2424DOCKER_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
23
34RUN \
45 apk add --update --no-cache --force-overwrite \
@@ -42,6 +43,6 @@ FROM runtime as build
4243
4344RUN \
4445 apk add --update --no-cache --force-overwrite \
45- llvm13 -dev llvm13 -static g++ libffi-dev
46+ llvm15 -dev llvm15 -static g++ libffi-dev
4647
4748CMD ["/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
22FROM ${base_docker_image} as runtime
33
44RUN \
@@ -23,9 +23,9 @@ FROM runtime as build
2323
2424RUN \
2525 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 && \
2727 apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
2828
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
3030
3131CMD ["/bin/sh" ]
You can’t perform that action at this time.
0 commit comments