Skip to content

Commit 52c99be

Browse files
committed
Upgrade base to ubuntu 20.04
The noninteractive env var had to be added since tzdata would try to ask for a region. ADDs changed to COPYs as it is good practice in the docker community. Also: - Remove fixed GCC_VER constraint (7.2.0 is not supported anymore) - Use rust musl make 0.9.9 (patch level update)
1 parent 81cb02c commit 52c99be

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

Dockerfile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:20.04
22

33
# The Rust toolchain to use when building our image
44
ARG TOOLCHAIN=stable
55
ARG TARGET=x86_64-unknown-linux-musl
66
ARG OPENSSL_ARCH=linux-x86_64
7+
ARG RUST_MUSL_MAKE_VER=0.9.9
78

9+
ENV DEBIAN_FRONTEND=noninteractive
810
ENV RUST_MUSL_CROSS_TARGET=$TARGET
911

1012
# Make sure we have basic dev tools for building C libraries. Our goal
@@ -26,15 +28,14 @@ RUN apt-get update && \
2628
apt-get clean && rm -rf /var/lib/apt/lists/*
2729

2830
# Install cross-signed Let's Encrypt R3 CA certificate
29-
ADD lets-encrypt-r3-cross-signed.crt /usr/local/share/ca-certificates
31+
COPY lets-encrypt-r3-cross-signed.crt /usr/local/share/ca-certificates
3032
RUN update-ca-certificates
3133

32-
ADD config.mak /tmp/config.mak
33-
RUN cd /tmp && \
34-
curl -Lsq -o musl-cross-make.zip https://github.com/richfelker/musl-cross-make/archive/v0.9.8.zip && \
34+
COPY config.mak /tmp/config.mak
35+
RUN cd /tmp && curl -Lsq -o musl-cross-make.zip https://github.com/richfelker/musl-cross-make/archive/v$RUST_MUSL_MAKE_VER.zip && \
3536
unzip -q musl-cross-make.zip && \
3637
rm musl-cross-make.zip && \
37-
mv musl-cross-make-0.9.8 musl-cross-make && \
38+
mv musl-cross-make-$RUST_MUSL_MAKE_VER musl-cross-make && \
3839
cp /tmp/config.mak /tmp/musl-cross-make/config.mak && \
3940
cd /tmp/musl-cross-make && \
4041
TARGET=$TARGET make install -j 4 > /tmp/musl-cross-make.log && \

config.mak

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ OUTPUT = /usr/local/musl
1515
# Setting a blank version for linux will suppress installation of kernel
1616
# headers, which are not needed unless compiling programs that use them.
1717

18-
# BINUTILS_VER = 2.25.1
19-
GCC_VER = 7.2.0
20-
21-
# MUSL_VER = 1.1.19
18+
# BINUTILS_VER =
19+
# GCC_VER =
20+
# MUSL_VER =
2221
# GMP_VER =
2322
# MPC_VER =
2423
# MPFR_VER =

0 commit comments

Comments
 (0)