From 4d360cd12c2078e843ec81b197b95bb26d17d882 Mon Sep 17 00:00:00 2001 From: casjay Date: Tue, 17 Sep 2024 14:43:40 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dockerfile rootfs/root/docker/setup/02-packages.sh --- Dockerfile | 4 ++-- rootfs/root/docker/setup/02-packages.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index b45884c..56ea837 100644 --- a/Dockerfile +++ b/Dockerfile @@ -55,7 +55,7 @@ ARG PHP_SERVER ARG SHELL_OPTS ARG DEBIAN_FRONTEND -ARG PACK_LIST="systemd systemd-sysv cron curl wget git jq openssh-server " +ARG PACK_LIST="curl wget git jq openssh-server " ENV ENV=~/.profile ENV SHELL="/bin/sh" @@ -74,7 +74,7 @@ COPY ./rootfs/usr/local/bin/. /usr/local/bin/ RUN set -e; \ echo "Setting up prerequisites"; \ - true + apt update && apt install -yy systemd systemd-sysv cron ENV SHELL="/bin/bash" SHELL [ "/bin/bash", "-c" ] diff --git a/rootfs/root/docker/setup/02-packages.sh b/rootfs/root/docker/setup/02-packages.sh index fc04e59..0205c7a 100755 --- a/rootfs/root/docker/setup/02-packages.sh +++ b/rootfs/root/docker/setup/02-packages.sh @@ -28,12 +28,12 @@ exitCode=0 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Predifined actions apt-get update -apt-get install ca-certificates curl +apt-get install -y ca-certificates curl install -m 0755 -d /etc/apt/keyrings curl -q -LSsf "https://download.docker.com/linux/debian/gpg" -o "/etc/apt/keyrings/docker.asc" chmod a+r /etc/apt/keyrings/docker.asc printf '%s %s\n' "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian" "$(. /etc/os-release && echo "$VERSION_CODENAME") stable" | tee /etc/apt/sources.list.d/docker.list >/dev/null -apt-get update && apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin +apt-get update && apt-get -y install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Main script