From 7fc262db6a960e6f6b4fedefed56adb17efff704 Mon Sep 17 00:00:00 2001 From: Chaosvex Date: Sun, 8 Mar 2026 04:28:02 +0000 Subject: [PATCH 1/4] Add default option to skip distro upgrade for Docker builds Taking a guess here. Probably made a syntax mistake. --- .github/workflows/docker-image.yml | 1 + Dockerfile | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index f33116855..b96eb117c 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -27,6 +27,7 @@ jobs: docker buildx build \ --load \ --file Dockerfile \ + ---build-arg SKIP_UPGRADE --cache-from=type=local,src=/tmp/docker-cache \ --cache-to=type=local,dest=/tmp/docker-cache,mode=max \ . diff --git a/Dockerfile b/Dockerfile index 3e1d98f57..23a966f3d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,13 @@ FROM ubuntu:resolute AS builder LABEL description="Development build environment" # Update the distro and install our tools -RUN apt-get -y update && apt-get -y upgrade \ - && apt-get -y install software-properties-common \ +RUN apt-get -y update + +RUN if [ -z "SKIP_UPGRADE" ]; then + apt-get -y upgrade + fi + +RUN apt-get -y install software-properties-common \ && apt-get -y install wget \ # GCC stuff && apt-get -y install build-essential gcc-15 g++-15 \ From bfd1d9b305f671e9fd8a5c3258cba85df3a608b8 Mon Sep 17 00:00:00 2001 From: Chaosvex Date: Sun, 8 Mar 2026 04:30:13 +0000 Subject: [PATCH 2/4] Fix --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index b96eb117c..393099b46 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -27,7 +27,7 @@ jobs: docker buildx build \ --load \ --file Dockerfile \ - ---build-arg SKIP_UPGRADE + --build-arg SKIP_UPGRADE \ --cache-from=type=local,src=/tmp/docker-cache \ --cache-to=type=local,dest=/tmp/docker-cache,mode=max \ . From 92c705e1fff2eaf126d197a1a400e93e879557b9 Mon Sep 17 00:00:00 2001 From: Chaosvex Date: Sun, 8 Mar 2026 04:31:46 +0000 Subject: [PATCH 3/4] Fix mistake I'm blaming on what was probably an LLM generated cheat sheet --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 23a966f3d..1c58abbc2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,9 +6,9 @@ LABEL description="Development build environment" # Update the distro and install our tools RUN apt-get -y update -RUN if [ -z "SKIP_UPGRADE" ]; then - apt-get -y upgrade - fi +if [ -z "SKIP_UPGRADE" ]; then + RUN apt-get -y upgrade +fi RUN apt-get -y install software-properties-common \ && apt-get -y install wget \ From c904eab71723ddca7365e32735c7315db571293d Mon Sep 17 00:00:00 2001 From: Chaosvex Date: Sun, 8 Mar 2026 04:33:49 +0000 Subject: [PATCH 4/4] Try again via bruteforce --- Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1c58abbc2..d992f7a3d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,9 +6,7 @@ LABEL description="Development build environment" # Update the distro and install our tools RUN apt-get -y update -if [ -z "SKIP_UPGRADE" ]; then - RUN apt-get -y upgrade -fi +RUN if [ -z "SKIP_UPGRADE" ]; then apt-get -y upgrade; fi RUN apt-get -y install software-properties-common \ && apt-get -y install wget \