From d20aa1f3f0e974803c164f63ba8c388047221494 Mon Sep 17 00:00:00 2001 From: fcd <1352288+femnad@users.noreply.github.com> Date: Sat, 16 Dec 2023 19:48:57 +0000 Subject: [PATCH] don't install curl when not needed --- Dockerfile.fedora | 2 +- terraform/Dockerfile.fedora-ci | 2 +- terraform/Dockerfile.ubuntu-ci | 2 +- tests/image/Dockerfile.ubuntu | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile.fedora b/Dockerfile.fedora index 9f3b601..ed9f42d 100644 --- a/Dockerfile.fedora +++ b/Dockerfile.fedora @@ -1,7 +1,7 @@ # Mostly intended for debugging full provisioning runs. from fedora:39 -run dnf install -y gnupg2 golang systemd +run dnf update -y && dnf install -y gnupg2 golang systemd copy . /root/fup/ workdir /root/fup diff --git a/terraform/Dockerfile.fedora-ci b/terraform/Dockerfile.fedora-ci index 1f91683..901c8a1 100644 --- a/terraform/Dockerfile.fedora-ci +++ b/terraform/Dockerfile.fedora-ci @@ -1,3 +1,3 @@ from fedora:39 -run dnf update -y && dnf install -y ca-certificates curl gnupg2 golang +run dnf update -y && dnf install -y ca-certificates gnupg2 golang diff --git a/terraform/Dockerfile.ubuntu-ci b/terraform/Dockerfile.ubuntu-ci index 911d674..94667fa 100644 --- a/terraform/Dockerfile.ubuntu-ci +++ b/terraform/Dockerfile.ubuntu-ci @@ -1,3 +1,3 @@ from ubuntu:mantic -run apt update -y && apt install -y ca-certificates curl gnupg2 golang +run apt update -y && apt install -y ca-certificates gnupg2 golang diff --git a/tests/image/Dockerfile.ubuntu b/tests/image/Dockerfile.ubuntu index f00b1a0..1b99b29 100644 --- a/tests/image/Dockerfile.ubuntu +++ b/tests/image/Dockerfile.ubuntu @@ -1,5 +1,5 @@ from ubuntu:mantic -run apt update -y && apt install -y curl gnupg2 systemd +run apt update -y && apt install -y gnupg2 systemd -cmd [ "/bin/systemd" ] +cmd ["/bin/systemd"]