Skip to content

Commit 0607a70

Browse files
Update build images to LLVM 15 (#231)
1 parent a80e188 commit 0607a70

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

docker/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ GC_VERSION = v8.2.0
1818

1919
OUTPUT_DIR := build
2020
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
2222
BUILD_ARGS_ALPINE := --build-arg crystal_targz=crystal.tar.gz $(BUILD_CONTEXT)/alpine --build-arg gc_version=$(GC_VERSION)
2323
DOCKER_TAG_UBUNTU := $(DOCKER_REPOSITORY):$(DOCKER_TAG)
2424
DOCKER_TAG_ALPINE := $(DOCKER_REPOSITORY):$(DOCKER_TAG)-alpine

docker/alpine.Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM alpine:3.16 as runtime
1+
ARG base_docker_image=alpine:3.17
2+
FROM ${base_docker_image} as runtime
23

34
RUN \
45
apk add --update --no-cache --force-overwrite \
@@ -42,6 +43,6 @@ FROM runtime as build
4243

4344
RUN \
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

4748
CMD ["/bin/sh"]

docker/ubuntu.Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG base_docker_image
1+
ARG base_docker_image=ubuntu:22.04
22
FROM ${base_docker_image} as runtime
33

44
RUN \
@@ -23,9 +23,9 @@ FROM runtime as build
2323

2424
RUN \
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

3131
CMD ["/bin/sh"]

0 commit comments

Comments
 (0)