Skip to content

Commit 6e8201b

Browse files
author
Brian J. Cardiff
authored
Update docker images to bionic and llvm-8 (#49)
1 parent aca99b2 commit 6e8201b

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

docker/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ RUN \
55
apt-get update && \
66
apt-get install -y apt-transport-https && \
77
apt-get update && \
8-
apt-get install -y tzdata gcc pkg-config libssl-dev libxml2-dev libyaml-dev libgmp-dev git make && \
9-
apt-get install -y libpcre3-dev libevent-dev && \
8+
DEBIAN_FRONTEND=noninteractive \
9+
apt-get install -y tzdata gcc pkg-config libssl-dev libxml2-dev libyaml-dev libgmp-dev git make \
10+
libpcre3-dev libevent-dev && \
1011
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
1112

1213
ARG crystal_deb
@@ -20,7 +21,7 @@ FROM runtime as build
2021

2122
RUN \
2223
apt-get update && \
23-
apt-get install -y build-essential llvm-4.0 libedit-dev libreadline-dev gdb && \
24+
apt-get install -y build-essential llvm-8 libedit-dev libreadline-dev gdb && \
2425
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
2526

2627
ENV LIBRARY_PATH=/usr/lib/crystal/lib/

docker/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ DOCKER_TAG ?= ## How to tag the docker image. a -build will be appended f
44
DOCKER_REPOSITORY ?= ## Docker hub repository to commit image
55

66
OUTPUT_DIR = build
7-
BUILD_ARGS64 = --build-arg crystal_deb=./tmp/crystal.deb --build-arg base_docker_image=ubuntu:xenial
8-
BUILD_ARGS32 = --build-arg crystal_deb=./tmp/crystal.deb --build-arg base_docker_image=i386/ubuntu:xenial
7+
BUILD_ARGS64 = --build-arg crystal_deb=./tmp/crystal.deb --build-arg base_docker_image=ubuntu:bionic
8+
BUILD_ARGS32 = --build-arg crystal_deb=./tmp/crystal.deb --build-arg base_docker_image=i386/ubuntu:bionic
99

1010
.PHONY: all64
1111
all64: $(OUTPUT_DIR)/docker-$(CRYSTAL_VERSION).tar.gz $(OUTPUT_DIR)/docker-$(CRYSTAL_VERSION)-build.tar.gz

0 commit comments

Comments
 (0)