Skip to content

Commit 06690f4

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 77252cc + ec050a3 commit 06690f4

File tree

52 files changed

+271
-158
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

+271
-158
lines changed

‎.changes/591.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[
2+
{
3+
"description": "update Ubuntu images to 20.04 LTS.",
4+
"type": "changed",
5+
"breaking": true,
6+
"issues": [417, 517, 556, 616]
7+
},
8+
{
9+
"description": "remove Linux image from `mips-unknown-linux-gnu`.",
10+
"type": "removed",
11+
"breaking": true
12+
}
13+
]

‎.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ jobs:
163163
- { target: thumbv7neon-unknown-linux-gnueabihf, os: ubuntu-latest, cpp: 1, dylib: 1, std: 1, run: 1, runners: qemu-user qemu-system }
164164
- { target: i586-unknown-linux-gnu, os: ubuntu-latest, cpp: 1, dylib: 1, std: 1, run: 1 }
165165
- { target: i686-unknown-linux-gnu, os: ubuntu-latest, cpp: 1, dylib: 1, std: 1, run: 1, runners: native qemu-user qemu-system }
166-
- { target: mips-unknown-linux-gnu, os: ubuntu-latest, cpp: 1, dylib: 1, std: 1, run: 1, runners: qemu-user qemu-system }
166+
- { target: mips-unknown-linux-gnu, os: ubuntu-latest, cpp: 1, dylib: 1, std: 1, run: 1, runners: qemu-user }
167167
- { target: mipsel-unknown-linux-gnu, os: ubuntu-latest, cpp: 1, dylib: 1, std: 1, run: 1, runners: qemu-user qemu-system }
168168
- { target: mips64-unknown-linux-gnuabi64, os: ubuntu-latest, cpp: 1, dylib: 1, std: 1, run: 1 }
169169
- { target: mips64el-unknown-linux-gnuabi64, os: ubuntu-latest, cpp: 1, dylib: 1, std: 1, run: 1, runners: qemu-user qemu-system }
@@ -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

Lines changed: 38 additions & 38 deletions

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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 4 additions & 10 deletions
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 /
@@ -15,18 +15,12 @@ RUN apt-get install --assume-yes --no-install-recommends \
1515
libc6-dev-mips-cross
1616

1717
COPY qemu.sh /
18-
RUN /qemu.sh mips softmmu
18+
RUN /qemu.sh mips
1919

20-
COPY dropbear.sh /
21-
RUN /dropbear.sh
22-
23-
COPY linux-image.sh /
24-
RUN /linux-image.sh mips
25-
26-
COPY linux-runner /
20+
COPY qemu-runner /
2721

2822
ENV CARGO_TARGET_MIPS_UNKNOWN_LINUX_GNU_LINKER=mips-linux-gnu-gcc \
29-
CARGO_TARGET_MIPS_UNKNOWN_LINUX_GNU_RUNNER="/linux-runner mips" \
23+
CARGO_TARGET_MIPS_UNKNOWN_LINUX_GNU_RUNNER="/qemu-runner mips" \
3024
CC_mips_unknown_linux_gnu=mips-linux-gnu-gcc \
3125
CXX_mips_unknown_linux_gnu=mips-linux-gnu-g++ \
3226
BINDGEN_EXTRA_CLANG_ARGS_mips_unknown_linux_gnu="--sysroot=/usr/mips-linux-gnu" \

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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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)