From 4747906ba8c5e70cab8a265a2104f5271d7aace4 Mon Sep 17 00:00:00 2001 From: Matthew Pomes Date: Tue, 7 Jul 2026 21:11:33 -0500 Subject: [PATCH] Spit install into script and add step to install docker apt repo --- rustup/Dockerfile | 10 ++-------- rustup/install-deps.sh | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 rustup/install-deps.sh diff --git a/rustup/Dockerfile b/rustup/Dockerfile index 47e65d2..de6e7ee 100644 --- a/rustup/Dockerfile +++ b/rustup/Dockerfile @@ -4,14 +4,8 @@ LABEL org.opencontainers.image.authors="matthew.pomes@pm.me" WORKDIR /root -# common packages -RUN apt-get update && \ - apt-get install --no-install-recommends -y \ - ca-certificates curl file \ - build-essential musl-tools \ - autoconf automake autotools-dev libtool xutils-dev \ - docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin \ - && rm -rf /var/lib/apt/lists/* +COPY ./install-deps.sh . +RUN bash ./install-deps.sh # ENV SSL_VERSION=1.0.2u diff --git a/rustup/install-deps.sh b/rustup/install-deps.sh new file mode 100644 index 0000000..5938d80 --- /dev/null +++ b/rustup/install-deps.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +apt update || exit 1 +apt upgrade -y || exit 1 +apt install --no-install-recommends -y ca-certificates curl || exit 1 +apt install --no-install-recommends -y file || exit 1 +apt install --no-install-recommends -y build-essential musl-tools || exit 1 +apt install --no-install-recommends -y autoconf automake autotools-dev libtool xutils-dev || exit 1 + +# Docker key +install -m 0755 -d /etc/apt/keyrings || exit 1 +curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc || exit 1 +chmod a+r /etc/apt/keyrings/docker.asc || exit 1 +tee /etc/apt/sources.list.d/docker.sources <