From 76ff5d7d26e69cc396e9dd3c257d7a9743039551 Mon Sep 17 00:00:00 2001 From: Natalie Somersall Date: Sun, 5 Jan 2025 15:19:00 -0700 Subject: [PATCH] bump docker, compose, clean scripts (#287) --- images/rootless-ubuntu-jammy.Dockerfile | 4 ++-- images/rootless-ubuntu-numbat.Dockerfile | 4 ++-- images/software/gh-cli.sh | 5 ++--- images/software/node20.sh | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/images/rootless-ubuntu-jammy.Dockerfile b/images/rootless-ubuntu-jammy.Dockerfile index 530ddf0..cee150d 100644 --- a/images/rootless-ubuntu-jammy.Dockerfile +++ b/images/rootless-ubuntu-jammy.Dockerfile @@ -5,8 +5,8 @@ ARG RUNNER_VERSION=2.321.0 ARG RUNNER_CONTAINER_HOOKS_VERSION=0.6.2 # Docker and Compose arguments -ARG DOCKER_VERSION=27.3.1 -ARG COMPOSE_VERSION=v2.31.0 +ARG DOCKER_VERSION=27.4.1 +ARG COMPOSE_VERSION=v2.32.0 # Dumb-init version ARG DUMB_INIT_VERSION=1.2.5 diff --git a/images/rootless-ubuntu-numbat.Dockerfile b/images/rootless-ubuntu-numbat.Dockerfile index 87385b0..0dd3a26 100644 --- a/images/rootless-ubuntu-numbat.Dockerfile +++ b/images/rootless-ubuntu-numbat.Dockerfile @@ -5,8 +5,8 @@ ARG RUNNER_VERSION=2.321.0 ARG RUNNER_CONTAINER_HOOKS_VERSION=0.6.2 # Docker and Compose arguments -ARG DOCKER_VERSION=27.3.1 -ARG COMPOSE_VERSION=v2.31.0 +ARG DOCKER_VERSION=27.4.1 +ARG COMPOSE_VERSION=v2.32.0 # Dumb-init version ARG DUMB_INIT_VERSION=1.2.5 diff --git a/images/software/gh-cli.sh b/images/software/gh-cli.sh index 2cb5bd6..4865290 100644 --- a/images/software/gh-cli.sh +++ b/images/software/gh-cli.sh @@ -7,9 +7,8 @@ if grep -q "Ubuntu\|Debian" "/etc/os-release"; then echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null apt-get install dirmngr -y apt-get update - apt-get install gh -y - apt-get autoclean - apt-get autoremove + apt-get install gh -y --no-install-recommends + apt-get clean rm -rf /var/lib/apt/lists/* elif grep -q "CentOS\|Red Hat" "/etc/redhat-release"; then yum-config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo diff --git a/images/software/node20.sh b/images/software/node20.sh index 6eb3574..a77beb0 100755 --- a/images/software/node20.sh +++ b/images/software/node20.sh @@ -5,5 +5,5 @@ NODE_MAJOR=20 echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list apt-get update apt-get install nodejs -y -apt-get autoclean +apt-get clean apt-get autoremove