From 438ec262d8cea316e89564e01b1672abd6c49c63 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Thu, 11 Jul 2024 19:29:28 -0400 Subject: [PATCH] dockerfiles: update packages for aarch64 to amd64 crosscompiles Signed-off-by: Ian Leonard --- tools/docker/jammy/Dockerfile | 8 +------- tools/docker/noble/Dockerfile | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/tools/docker/jammy/Dockerfile b/tools/docker/jammy/Dockerfile index 66e26c3fe3..c579e44511 100644 --- a/tools/docker/jammy/Dockerfile +++ b/tools/docker/jammy/Dockerfile @@ -29,13 +29,7 @@ RUN apt-get install -y \ && ln -s /usr/lib/go-1.22/bin/gofmt /usr/bin/gofmt RUN if [ "$(uname -m)" = "aarch64" ]; then \ - echo 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse' > /etc/apt/sources.list.d/amd64.list; \ - echo 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse' >> /etc/apt/sources.list.d/amd64.list; \ - echo 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse' >> /etc/apt/sources.list.d/amd64.list; \ - echo 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse' >> /etc/apt/sources.list.d/amd64.list; \ - apt-get update; \ - dpkg --add-architecture amd64; \ - apt-get install -y libc6:amd64 qemu-user-binfmt --no-install-recommends; \ + apt-get install -y libc6-amd64-cross qemu-user-binfmt --no-install-recommends; \ fi RUN rm -rf /var/lib/apt/lists/* diff --git a/tools/docker/noble/Dockerfile b/tools/docker/noble/Dockerfile index 6c32d4a9d2..8dc2026257 100644 --- a/tools/docker/noble/Dockerfile +++ b/tools/docker/noble/Dockerfile @@ -28,13 +28,7 @@ RUN apt-get install -y \ && ln -s /usr/lib/go-1.23/bin/gofmt /usr/bin/gofmt RUN if [ "$(uname -m)" = "aarch64" ]; then \ - echo 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ noble main restricted universe multiverse' > /etc/apt/sources.list.d/amd64.list; \ - echo 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ noble-updates main restricted universe multiverse' >> /etc/apt/sources.list.d/amd64.list; \ - echo 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ noble-security main restricted universe multiverse' >> /etc/apt/sources.list.d/amd64.list; \ - echo 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ noble-backports main restricted universe multiverse' >> /etc/apt/sources.list.d/amd64.list; \ - apt-get update; \ - dpkg --add-architecture amd64; \ - apt-get install -y libc6:amd64 qemu-user-binfmt --no-install-recommends; \ + apt-get install -y libc6-amd64-cross qemu-user-binfmt --no-install-recommends; \ fi RUN rm -rf /var/lib/apt/lists/*