Skip to content

Commit

Permalink
Upgrade base to ubuntu 20.04
Browse files Browse the repository at this point in the history
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)
- Use openssl 1.0.2u (patch level update)
  • Loading branch information
asaaki committed Mar 20, 2021
1 parent 81cb02c commit 1babaad
Show file tree
Hide file tree
Showing 5 changed files with 94 additions and 21 deletions.
15 changes: 13 additions & 2 deletions .github/workflows/Build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,39 @@ jobs:
- IMAGE_TAG: aarch64-musl
TARGET: aarch64-unknown-linux-musl
OPENSSL_ARCH: linux-aarch64
RUST_MUSL_MAKE_CONFIG: config.mak
- IMAGE_TAG: arm-musleabi
TARGET: arm-unknown-linux-musleabi
OPENSSL_ARCH: linux-generic32
RUST_MUSL_MAKE_CONFIG: config.mak.32
- IMAGE_TAG: arm-musleabihf
TARGET: arm-unknown-linux-musleabihf
RUST_MUSL_MAKE_CONFIG: config.mak.32
OPENSSL_ARCH: linux-generic32
- IMAGE_TAG: armv5te-musleabi
TARGET: armv5te-unknown-linux-musleabi
OPENSSL_ARCH: linux-generic32
RUST_MUSL_MAKE_CONFIG: config.mak.32
- IMAGE_TAG: armv7-musleabi
TARGET: armv7-unknown-linux-musleabi
OPENSSL_ARCH: linux-generic32
RUST_MUSL_MAKE_CONFIG: config.mak.32
- IMAGE_TAG: armv7-musleabihf
TARGET: armv7-unknown-linux-musleabihf
OPENSSL_ARCH: linux-generic32
RUST_MUSL_MAKE_CONFIG: config.mak.32
- IMAGE_TAG: i586-musl
TARGET: i586-unknown-linux-musl
OPENSSL_ARCH: linux-elf
RUST_MUSL_MAKE_CONFIG: config.mak.32
- IMAGE_TAG: i686-musl
TARGET: i686-unknown-linux-musl
OPENSSL_ARCH: linux-elf
RUST_MUSL_MAKE_CONFIG: config.mak.32
- IMAGE_TAG: mips-musl
TARGET: mips-unknown-linux-musl
OPENSSL_ARCH: linux-mips32
RUST_MUSL_MAKE_CONFIG: config.mak.32
# - IMAGE_TAG: mips64-muslabi64
# TARGET: mips64-unknown-linux-muslabi64
# OPENSSL_ARCH: linux64-mips64
Expand All @@ -49,16 +58,18 @@ jobs:
- IMAGE_TAG: mipsel-musl
TARGET: mipsel-unknown-linux-musl
OPENSSL_ARCH: linux-mips32
RUST_MUSL_MAKE_CONFIG: config.mak.32
- IMAGE_TAG: x86_64-musl
TARGET: x86_64-unknown-linux-musl
OPENSSL_ARCH: linux-x86_64
RUST_MUSL_MAKE_CONFIG: config.mak.32
env: ${{ matrix.env }}
steps:
- uses: actions/checkout@v2
- name: Build Docker image
run: |
docker build --build-arg TARGET="$TARGET" --build-arg OPENSSL_ARCH="$OPENSSL_ARCH" -t messense/rust-musl-cross:$IMAGE_TAG .
docker build --build-arg TARGET="$TARGET" --build-arg OPENSSL_ARCH="$OPENSSL_ARCH" --build-arg RUST_MUSL_MAKE_CONFIG="$RUST_MUSL_MAKE_CONFIG" -t messense/rust-musl-cross:$IMAGE_TAG .
docker run --rm -v "$(pwd)/tests":/home/rust/src messense/rust-musl-cross:$IMAGE_TAG cargo build
- name: Push Docker image
if: github.ref == 'refs/heads/master'
run: docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} && docker push messense/rust-musl-cross:$IMAGE_TAG
run: docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} && docker push messense/rust-musl-cross:$IMAGE_TAG
18 changes: 10 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
FROM ubuntu:16.04
FROM ubuntu:20.04

# The Rust toolchain to use when building our image
ARG TOOLCHAIN=stable
ARG TARGET=x86_64-unknown-linux-musl
ARG OPENSSL_ARCH=linux-x86_64
ARG RUST_MUSL_MAKE_VER=0.9.9
ARG RUST_MUSL_MAKE_CONFIG=config.mak

ENV DEBIAN_FRONTEND=noninteractive
ENV RUST_MUSL_CROSS_TARGET=$TARGET

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

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

ADD config.mak /tmp/config.mak
RUN cd /tmp && \
curl -Lsq -o musl-cross-make.zip https://github.com/richfelker/musl-cross-make/archive/v0.9.8.zip && \
COPY $RUST_MUSL_MAKE_CONFIG /tmp/config.mak
RUN cd /tmp && curl -Lsq -o musl-cross-make.zip https://github.com/richfelker/musl-cross-make/archive/v$RUST_MUSL_MAKE_VER.zip && \
unzip -q musl-cross-make.zip && \
rm musl-cross-make.zip && \
mv musl-cross-make-0.9.8 musl-cross-make && \
mv musl-cross-make-$RUST_MUSL_MAKE_VER musl-cross-make && \
cp /tmp/config.mak /tmp/musl-cross-make/config.mak && \
cd /tmp/musl-cross-make && \
TARGET=$TARGET make install -j 4 > /tmp/musl-cross-make.log && \
Expand Down Expand Up @@ -83,8 +85,8 @@ RUN export CC=$TARGET_CC && \
make && sudo make install -j 4 && \
cd .. && rm -rf zlib-$VERS.tar.gz zlib-$VERS checksums.txt && \
echo "Building OpenSSL" && \
VERS=1.0.2q && \
CHECKSUM=5744cfcbcec2b1b48629f7354203bc1e5e9b5466998bbccc5b5fcde3b18eb684 && \
VERS=1.0.2u && \
CHECKSUM=ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16 && \
curl -sqO https://www.openssl.org/source/openssl-$VERS.tar.gz && \
echo "$CHECKSUM openssl-$VERS.tar.gz" > checksums.txt && \
sha256sum -c checksums.txt && \
Expand Down
16 changes: 9 additions & 7 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
#!/bin/bash
set -ex

# x86_64-unknown-linux-musl
docker build -t messense/rust-musl-cross:x86_64-musl .
# arm-unknown-linux-musleabi
docker build --build-arg TARGET=arm-unknown-linux-musleabi --build-arg OPENSSL_ARCH=linux-generic32 -t messense/rust-musl-cross:arm-musleabi .
docker build --build-arg TARGET=arm-unknown-linux-musleabi --build-arg OPENSSL_ARCH=linux-generic32 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:arm-musleabi .
# arm-unknown-linux-musleabihf
docker build --build-arg TARGET=arm-unknown-linux-musleabihf --build-arg OPENSSL_ARCH=linux-generic32 -t messense/rust-musl-cross:arm-musleabihf .
docker build --build-arg TARGET=arm-unknown-linux-musleabihf --build-arg OPENSSL_ARCH=linux-generic32 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:arm-musleabihf .
# armv5te-unknown-linux-musleabi
docker build --build-arg TARGET=armv5te-unknown-linux-musleabi --build-arg OPENSSL_ARCH=linux-generic32 -t messense/rust-musl-cross:arm-musleabi .
docker build --build-arg TARGET=armv5te-unknown-linux-musleabi --build-arg OPENSSL_ARCH=linux-generic32 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:armv5te-musleabi .
# armv7-unknown-linux-musleabihf
docker build --build-arg TARGET=armv7-unknown-linux-musleabihf --build-arg OPENSSL_ARCH=linux-generic32 -t messense/rust-musl-cross:armv7-musleabihf .
docker build --build-arg TARGET=armv7-unknown-linux-musleabihf --build-arg OPENSSL_ARCH=linux-generic32 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:armv7-musleabihf .
# i686-unknown-linux-musl
docker build --build-arg TARGET=i686-unknown-linux-musl --build-arg OPENSSL_ARCH=linux-generic32 -t messense/rust-musl-cross:i686-musl .
docker build --build-arg TARGET=i686-unknown-linux-musl --build-arg OPENSSL_ARCH=linux-generic32 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:i686-musl .
# mips-unknown-linux-musl
docker build --build-arg TARGET=mips-unknown-linux-musl --build-arg OPENSSL_ARCH=linux-mips32 -t messense/rust-musl-cross:mips-musl .
docker build --build-arg TARGET=mips-unknown-linux-musl --build-arg OPENSSL_ARCH=linux-mips32 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:mips-musl .
# mipsel-unknown-linux-musl
docker build --build-arg TARGET=mipsel-unknown-linux-musl --build-arg OPENSSL_ARCH=linux-mips32 -t messense/rust-musl-cross:mipsel-musl .
docker build --build-arg TARGET=mipsel-unknown-linux-musl --build-arg OPENSSL_ARCH=linux-mips32 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:mipsel-musl .
7 changes: 3 additions & 4 deletions config.mak
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@ OUTPUT = /usr/local/musl
# Setting a blank version for linux will suppress installation of kernel
# headers, which are not needed unless compiling programs that use them.

# BINUTILS_VER = 2.25.1
GCC_VER = 7.2.0

# MUSL_VER = 1.1.19
# BINUTILS_VER =
# GCC_VER =
# MUSL_VER =
# GMP_VER =
# MPC_VER =
# MPFR_VER =
Expand Down
59 changes: 59 additions & 0 deletions config.mak.32
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# By default, cross compilers are installed to ./output under the top-level
# musl-cross-make directory and can later be moved wherever you want them.
# To install directly to a specific location, set it here. Multiple targets
# can safely be installed in the same location. Some examples:

OUTPUT = /usr/local/musl

# By default, latest supported release versions of musl and the toolchain
# components are used. You can override those here, but the version selected
# must be supported (under hashes/ and patches/) to work. For musl, you
# can use "git-refname" (e.g. git-master) instead of a release. Setting a
# blank version for gmp, mpc, mpfr and isl will suppress download and
# in-tree build of these libraries and instead depend on pre-installed
# libraries when available (isl is optional and not set by default).
# Setting a blank version for linux will suppress installation of kernel
# headers, which are not needed unless compiling programs that use them.

# BINUTILS_VER =
# GCC_VER =

# https://github.com/rust-embedded/cross/issues/478
# https://github.com/rust-lang/libc/issues/1848
MUSL_VER = 1.1.24

# GMP_VER =
# MPC_VER =
# MPFR_VER =
# ISL_VER =
# LINUX_VER =

# By default source archives are downloaded with wget. curl is also an option.

# DL_CMD = wget -c -O
DL_CMD = curl -C - -L -o

# Something like the following can be used to produce a static-linked
# toolchain that's deployable to any system with matching arch, using
# an existing musl-targeted cross compiler. This only # works if the
# system you build on can natively (or via binfmt_misc and # qemu) run
# binaries produced by the existing toolchain (in this example, i486).

# COMMON_CONFIG += CC="i486-linux-musl-gcc -static --static" CXX="i486-linux-musl-g++ -static --static"

# Recommended options for smaller build for deploying binaries:

COMMON_CONFIG += CFLAGS="-g0 -Os" CXXFLAGS="-g0 -Os" LDFLAGS="-s"

# Recommended options for faster/simpler build:

COMMON_CONFIG += --disable-nls
GCC_CONFIG += --enable-languages=c,c++
GCC_CONFIG += --disable-libquadmath --disable-decimal-float
GCC_CONFIG += --disable-multilib

# You can keep the local build path out of your toolchain binaries and
# target libraries with the following, but then gdb needs to be told
# where to look for source files.

COMMON_CONFIG += --with-debug-prefix-map=$(CURDIR)=

0 comments on commit 1babaad

Please sign in to comment.