From ba58119be69754a926f59707c99e5e511dfb88c4 Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 11 Jun 2026 16:22:05 +0800 Subject: [PATCH 1/6] don't use terra-sccache, use sccache instead we cannot create the builder because terra-sccache cannot be built when the builder doesn't exist. This removes the need to build terra-sccache during the bootstrap process --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 17c0e97..e561eac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,5 +11,5 @@ RUN sed -i 's/.fc%{fedora}/.fcrawhide/g' /usr/lib/rpm/macros.d/macros.dist && \ dnf up -y && \ dnf swap -y systemd-standalone-sysusers systemd && \ dnf in -y terra-mock-configs subatomic-cli anda{,-srpm-macros} terra-appstream-helper mock-scm \ - gh wget less podman fuse-overlayfs dnf5-plugins util-linux-script mold sudo terra-sccache jq @buildsys-build && \ + gh wget less podman fuse-overlayfs dnf5-plugins util-linux-script mold sudo sccache jq @buildsys-build && \ dnf clean packages dbcache From 5f932be4b1177a8bf4aee5b4b27b256fd01998d5 Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 12 Jun 2026 14:28:54 +0800 Subject: [PATCH 2/6] install prebuilt sccache --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index e561eac..ecaf9ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,8 @@ RUN sed -i 's/.fc%{fedora}/.fcrawhide/g' /usr/lib/rpm/macros.d/macros.dist && \ sed -iE '/^metadata_expire/d' /etc/yum.repos.d/fedora-rawhide.repo && \ cat /etc/yum.repos.d/fedora-rawhide.repo >> /etc/dnf/dnf.conf && \ cat /etc/dnf/dnf.conf && \ + curl https://github.com/mozilla/sccache/releases/download/v0.15.0/sccache-v0.15.0-$(arch)-unknown-linux-musl.tar.gz | tar x --strip-components=1 && \ + install -Dpm755 sccache -t /usr/bin && \ dnf in -y --nogpgcheck --repo=terra terra-gpg-keys && \ dnf up -y && \ dnf swap -y systemd-standalone-sysusers systemd && \ From 26391e79bdfba6b165167b54a7a99ef35c377978 Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 12 Jun 2026 14:29:15 +0800 Subject: [PATCH 3/6] get rid of fedora sccache --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ecaf9ea..4ddba40 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,5 +13,5 @@ RUN sed -i 's/.fc%{fedora}/.fcrawhide/g' /usr/lib/rpm/macros.d/macros.dist && \ dnf up -y && \ dnf swap -y systemd-standalone-sysusers systemd && \ dnf in -y terra-mock-configs subatomic-cli anda{,-srpm-macros} terra-appstream-helper mock-scm \ - gh wget less podman fuse-overlayfs dnf5-plugins util-linux-script mold sudo sccache jq @buildsys-build && \ + gh wget less podman fuse-overlayfs dnf5-plugins util-linux-script mold sudo jq @buildsys-build && \ dnf clean packages dbcache From f6a92d88d6b4c5a15e49de53f0c706119f47a37f Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 12 Jun 2026 14:30:59 +0800 Subject: [PATCH 4/6] tar sccache after tar install --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4ddba40..a98e1cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,11 +7,11 @@ RUN sed -i 's/.fc%{fedora}/.fcrawhide/g' /usr/lib/rpm/macros.d/macros.dist && \ sed -iE '/^metadata_expire/d' /etc/yum.repos.d/fedora-rawhide.repo && \ cat /etc/yum.repos.d/fedora-rawhide.repo >> /etc/dnf/dnf.conf && \ cat /etc/dnf/dnf.conf && \ - curl https://github.com/mozilla/sccache/releases/download/v0.15.0/sccache-v0.15.0-$(arch)-unknown-linux-musl.tar.gz | tar x --strip-components=1 && \ - install -Dpm755 sccache -t /usr/bin && \ dnf in -y --nogpgcheck --repo=terra terra-gpg-keys && \ dnf up -y && \ dnf swap -y systemd-standalone-sysusers systemd && \ dnf in -y terra-mock-configs subatomic-cli anda{,-srpm-macros} terra-appstream-helper mock-scm \ - gh wget less podman fuse-overlayfs dnf5-plugins util-linux-script mold sudo jq @buildsys-build && \ + gh wget less podman fuse-overlayfs dnf5-plugins util-linux-script mold sudo jq @buildsys-build tar && \ + curl https://github.com/mozilla/sccache/releases/download/v0.15.0/sccache-v0.15.0-$(arch)-unknown-linux-musl.tar.gz | tar x --strip-components=1 && \ + install -Dpm755 sccache -t /usr/bin && \ dnf clean packages dbcache From 7c539af7aeb2990ebcb8cea8672d6c905e416538 Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 12 Jun 2026 14:33:18 +0800 Subject: [PATCH 5/6] curl redirect with -L --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a98e1cb..ac4c416 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,6 @@ RUN sed -i 's/.fc%{fedora}/.fcrawhide/g' /usr/lib/rpm/macros.d/macros.dist && \ dnf swap -y systemd-standalone-sysusers systemd && \ dnf in -y terra-mock-configs subatomic-cli anda{,-srpm-macros} terra-appstream-helper mock-scm \ gh wget less podman fuse-overlayfs dnf5-plugins util-linux-script mold sudo jq @buildsys-build tar && \ - curl https://github.com/mozilla/sccache/releases/download/v0.15.0/sccache-v0.15.0-$(arch)-unknown-linux-musl.tar.gz | tar x --strip-components=1 && \ + curl -L https://github.com/mozilla/sccache/releases/download/v0.15.0/sccache-v0.15.0-$(arch)-unknown-linux-musl.tar.gz | tar x --strip-components=1 && \ install -Dpm755 sccache -t /usr/bin && \ dnf clean packages dbcache From 34250eb89e76d733252bee47918a17e0c2dfc0db Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 12 Jun 2026 14:35:22 +0800 Subject: [PATCH 6/6] tar xz --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ac4c416..0057fc3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,6 @@ RUN sed -i 's/.fc%{fedora}/.fcrawhide/g' /usr/lib/rpm/macros.d/macros.dist && \ dnf swap -y systemd-standalone-sysusers systemd && \ dnf in -y terra-mock-configs subatomic-cli anda{,-srpm-macros} terra-appstream-helper mock-scm \ gh wget less podman fuse-overlayfs dnf5-plugins util-linux-script mold sudo jq @buildsys-build tar && \ - curl -L https://github.com/mozilla/sccache/releases/download/v0.15.0/sccache-v0.15.0-$(arch)-unknown-linux-musl.tar.gz | tar x --strip-components=1 && \ + curl -L https://github.com/mozilla/sccache/releases/download/v0.15.0/sccache-v0.15.0-$(arch)-unknown-linux-musl.tar.gz | tar xz --strip-components=1 && \ install -Dpm755 sccache -t /usr/bin && \ dnf clean packages dbcache