Skip to content

Commit 832c88d

Browse files
bors[bot]Alexhuszagh
bors[bot]
and
Alexhuszagh
authored
Merge #591
591: Update all GNU docker images to latest LTS version on Docker. r=Emilgardis a=Alexhuszagh Increment Ubuntu base image versions to 20.04. Update linux-image script to latest kernel and debian versions. Update by default to kernel version 5.10.0-8. This means updating our debian source to bullseye from buster. 32-bit big-endian mips was discontinued in bullseye, so we revert to buster. For some images, due to constantly updating linux kernel versions, we need to use wildcards otherwise the build step breaks. Since there may be more than one relevant package, we've added a function to manually expand wildcards and select the best kernel version, `max_kernel_version`. Likewise, on 32-bit big-endian mips, we need to specify the ncurses version. Created temporary symlinks for autconf and autom4te due to the build expecting a hard-coded version (2.69) of these binaries. Fixed the patch for `debian/rules` due to changed line numbers. Updated the patch to use dwarf rather than sjlj exceptions to patch the template file (`debian/gcc-mingw-w64-i686.install.in`) since `debian/gcc-mingw-w64-i686.install` is overwritten during the build. For `x86_64-unknown-linux-gnu`, building the linux image fails unless we download specific versions of `libgcc-s1` and `libstdc++6`, since the pre-installed Ubuntu versions are higher than the Debian versions. We therefore extract the specific versions. However, while building the linux image, it prefers these system versions, so we must uninstall them or else while running `qemu-system` it cannot find `libgcc_s1.so.1`. Since `apt` and basically every other package besides `dpkg` relies on `libgcc-s1`, we have to temporarily delete it and reinstall it. Closes #616. Closes #557. We've already addressed the Qemu fixes, which will be applied automatically. Closes #517. Closes #417. Replaces #481. Co-authored-by: Alex Huszagh <[email protected]>
2 parents 8ff7c73 + 6dbdac1 commit 832c88d

File tree

52 files changed

+260
-148
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+260
-148
lines changed

‎.changes/591.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"description": "Update Ubuntu images to 20.04 LTS.",
3+
"type": "changed",
4+
"breaking": true,
5+
"issues": [417, 517, 556, 616]
6+
}

‎.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ jobs:
267267
- name: Build Docker image
268268
id: build-docker-image
269269
if: steps.prepare-meta.outputs.has-image
270-
timeout-minutes: 60
270+
timeout-minutes: 120
271271
run: cargo xtask build-docker-image -v "${TARGET}${SUB:+.$SUB}"
272272
env:
273273
TARGET: ${{ matrix.target }}

‎README.md

+38-38

‎docker/Dockerfile.aarch64-unknown-linux-gnu

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.aarch64-unknown-linux-musl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.arm-unknown-linux-gnueabi

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.arm-unknown-linux-gnueabihf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.arm-unknown-linux-musleabi

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.arm-unknown-linux-musleabihf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.armv5te-unknown-linux-gnueabi

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.armv5te-unknown-linux-musleabi

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.armv7-unknown-linux-gnueabi

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.armv7-unknown-linux-gnueabihf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.armv7-unknown-linux-musleabi

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.i586-unknown-linux-gnu

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.i586-unknown-linux-musl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.i686-pc-windows-gnu

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.i686-unknown-freebsd

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.i686-unknown-linux-gnu

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.i686-unknown-linux-musl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.mips-unknown-linux-gnu

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.mips-unknown-linux-musl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.mips64-unknown-linux-gnuabi64

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.mips64-unknown-linux-muslabi64

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:20.04
22

33
COPY common.sh lib.sh /
44
RUN /common.sh

‎docker/Dockerfile.mips64el-unknown-linux-gnuabi64

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.mips64el-unknown-linux-muslabi64

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:20.04
22

33
COPY common.sh lib.sh /
44
RUN /common.sh

‎docker/Dockerfile.mipsel-unknown-linux-gnu

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.mipsel-unknown-linux-musl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.powerpc-unknown-linux-gnu

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.powerpc64-unknown-linux-gnu

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.powerpc64le-unknown-linux-gnu

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.riscv64gc-unknown-linux-gnu

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.s390x-unknown-linux-gnu

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.sparc64-unknown-linux-gnu

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.sparcv9-sun-solaris

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.thumbv6m-none-eabi

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.thumbv7em-none-eabi

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.thumbv7em-none-eabihf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.thumbv7m-none-eabi

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.thumbv7neon-unknown-linux-gnueabihf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.x86_64-pc-windows-gnu

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.x86_64-sun-solaris

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.x86_64-unknown-dragonfly

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.x86_64-unknown-freebsd

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.x86_64-unknown-linux-gnu

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

‎docker/Dockerfile.x86_64-unknown-linux-gnu.centos

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY lib.sh /

‎docker/Dockerfile.x86_64-unknown-netbsd

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:20.04
22
ARG DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /

0 commit comments

Comments
 (0)