From 5e6b81c2e6af4c20ebaeeee549770609c401b872 Mon Sep 17 00:00:00 2001
From: Jakob Meier <comcloudway@ccw.icu>
Date: Thu, 4 Jan 2024 19:47:33 +0100
Subject: [PATCH] Fixed rootbld repositories

---
 .builds/build-all.yml         | 8 +++++---
 main/.rootbld-repositories    | 7 ++++---
 testing/.rootbld-repositories | 8 +++++---
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.builds/build-all.yml b/.builds/build-all.yml
index 40b8ca9..1709146 100644
--- a/.builds/build-all.yml
+++ b/.builds/build-all.yml
@@ -21,8 +21,10 @@ environment:
   targets:
     - x86_64
   builddir: ccw-aports
-  mirror: "https://s3.ccw.icu"
-  mirror_bucket: "mirror"
+  alpine_mirror: "https://dl-cdn.alpinelinux.org/alpine"
+  mirror: "https://mirror.ccw.icu"
+  s3_url: "https://s3.ccw.icu"
+  s3_bucket: "mirror"
   owner: "comcloudway@ccw.icu"
 sources:
   - https://git.hut.ccw.icu/~comcloudway/ccw-aports
@@ -40,7 +42,7 @@ tasks:
       sudo modprobe fuse
       sudo mv ~/.passwd-s3fs /etc/passwd-s3fs
       mkdir -p ~/packages
-      sudo s3fs $mirror_bucket ~/packages -o url=$mirror -o use_path_request_style -o umask=0007,uid=$(id -u) -o allow_other
+      sudo s3fs $s3_bucket ~/packages -o url=$s3_url -o use_path_request_style -o umask=0007,uid=$(id -u) -o allow_other
       # configure keypath
       echo 'PACKAGER_PRIVKEY=$HOME/.abuild/$owner.rsa' >> $HOME/.abuild/abuild.conf
       # start binfmt service for userspace emulation 
diff --git a/main/.rootbld-repositories b/main/.rootbld-repositories
index d3b689a..c9ca002 100644
--- a/main/.rootbld-repositories
+++ b/main/.rootbld-repositories
@@ -1,3 +1,4 @@
-$mirror/$version/main
-$mirror/$version/community
-$mirror/$version/testing
+$alpine_mirror/$version/main
+$alpine_mirror/$version/community
+$alpine_mirror/$version/testing
+$mirror/main
diff --git a/testing/.rootbld-repositories b/testing/.rootbld-repositories
index d3b689a..ae51d19 100644
--- a/testing/.rootbld-repositories
+++ b/testing/.rootbld-repositories
@@ -1,3 +1,5 @@
-$mirror/$version/main
-$mirror/$version/community
-$mirror/$version/testing
+$alpine_mirror/$version/main
+$alpine_mirror/$version/community
+$alpine_mirror/$version/testing
+$mirror/main
+$mirror/testing
-- 
2.38.5