From 33de7675bae90c0743002b85b17367c04ec00709 Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Sat, 16 Oct 2021 11:21:01 +0000 Subject: [PATCH] ALL: Install curl in all images --- toolchains/common/prepare.sh | 1 + toolchains/devkitarm/Dockerfile.m4 | 1 - toolchains/devkitswitch/Dockerfile.m4 | 1 - workers/m4/debian-builder-base.m4 | 1 + 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchains/common/prepare.sh b/toolchains/common/prepare.sh index 66f5c69..bd0d705 100755 --- a/toolchains/common/prepare.sh +++ b/toolchains/common/prepare.sh @@ -10,6 +10,7 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ automake \ ca-certificates \ cmake \ + curl \ debhelper \ dpkg-dev \ git \ diff --git a/toolchains/devkitarm/Dockerfile.m4 b/toolchains/devkitarm/Dockerfile.m4 index e8fceaa..4a88802 100644 --- a/toolchains/devkitarm/Dockerfile.m4 +++ b/toolchains/devkitarm/Dockerfile.m4 @@ -14,7 +14,6 @@ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ bzip2 \ ca-certificates \ - curl \ gnupg \ libxml2 \ make \ diff --git a/toolchains/devkitswitch/Dockerfile.m4 b/toolchains/devkitswitch/Dockerfile.m4 index f62455b..3fe6ddd 100644 --- a/toolchains/devkitswitch/Dockerfile.m4 +++ b/toolchains/devkitswitch/Dockerfile.m4 @@ -14,7 +14,6 @@ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ bzip2 \ ca-certificates \ - curl \ gnupg \ libxml2 \ make \ diff --git a/workers/m4/debian-builder-base.m4 b/workers/m4/debian-builder-base.m4 index 087cb5e..8f6f4a0 100644 --- a/workers/m4/debian-builder-base.m4 +++ b/workers/m4/debian-builder-base.m4 @@ -10,6 +10,7 @@ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ bzip2 \ ccache \ + curl \ git \ make \ pandoc \