Merge remote-tracking branch 'origin' into update/marketplace-for-brochure

README.md

@@ -48,7 +48,8 @@
 <br />
 
 ## Running StartOS
-There are multiple ways to get started with StartOS:
+> [!WARNING]
+> StartOS is in beta. It lacks features. It doesn't always work perfectly. Start9 servers are not plug and play. Using them properly requires some effort and patience. Please do not use StartOS or purchase a server if you are unable or unwilling to follow instructions and learn new concepts.
 
 ### 💰 Buy a Start9 server
 This is the most convenient option. Simply [buy a server](https://store.start9.com) from Start9 and plug it in.

core/startos/src/registry/admin.rs

@@ -74,12 +74,14 @@ async fn do_upload(
     mut url: Url,
     user: &str,
     pass: &str,
+    pkg_id: &str,
     body: Body,
 ) -> Result<(), Error> {
     url.set_path("/admin/v0/upload");
     let req = httpc
         .post(url)
         .header(header::ACCEPT, "text/plain")
+        .query(&[("id", pkg_id)])
         .basic_auth(user, Some(pass))
         .body(body)
         .build()?;
@@ -198,6 +200,7 @@ pub async fn publish(
             registry.clone(),
             &user,
             &pass,
+            &pkg.id,
             Body::wrap_stream(file_stream),
         )
         .await?;

image-recipe/build.sh

@@ -169,8 +169,16 @@ echo "deb [arch=${IB_TARGET_ARCH} signed-by=/etc/apt/trusted.gpg.d/tor.key.gpg]
 curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o config/archives/docker.key
 echo "deb [arch=${IB_TARGET_ARCH} signed-by=/etc/apt/trusted.gpg.d/docker.key.gpg] https://download.docker.com/linux/debian ${IB_SUITE} stable" > config/archives/docker.list
 
-curl -fsSL https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/Debian_Testing/Release.key | gpg --dearmor -o config/archives/podman.key
-echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/trusted.gpg.d/podman.key.gpg] https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/Debian_Testing/ /" > config/archives/podman.list
+echo "deb http://deb.debian.org/debian/ trixie main contrib" > config/archives/trixie.list
+cat > config/archives/trixie.pref <<- EOF
+Package: *
+Pin: release n=trixie
+Pin-Priority: 100
+
+Package: podman
+Pin: release n=trixie
+Pin-Priority: 600
+EOF
 
 # Dependencies