update time dependency in core (#2850)

Update README.md

README.md

@@ -13,9 +13,6 @@
   <a href="https://twitter.com/start9labs">
     <img alt="X (formerly Twitter) Follow" src="https://img.shields.io/twitter/follow/start9labs">
   </a>
-  <a href="https://mastodon.start9labs.com">
-    <img src="https://img.shields.io/mastodon/follow/000000001?domain=https%3A%2F%2Fmastodon.start9labs.com&label=Follow&style=social">
-  </a>
   <a href="https://matrix.to/#/#community:matrix.start9labs.com">
     <img alt="Static Badge" src="https://img.shields.io/badge/community-matrix-yellow?logo=matrix">
   </a>

build/dpkg-deps/depends

@@ -41,7 +41,6 @@ qemu-guest-agent
 rsync
 samba-common-bin
 smartmontools
-socat
 sqlite3
 squashfs-tools
 sudo

core/Cargo.lock

@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "Inflector"
@@ -245,7 +245,7 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 [[package]]
 name = "avahi-sys"
 version = "0.10.0"
-source = "git+https://github.com/Start9Labs/avahi-sys?branch=feature/dynamic-linking#12bef9e435cfb0d36cb229b9d08e2114c176ea7a"
+source = "git+https://github.com/Start9Labs/avahi-sys?branch=feature%2Fdynamic-linking#12bef9e435cfb0d36cb229b9d08e2114c176ea7a"
 dependencies = [
  "bindgen",
  "libc",
@@ -1290,9 +1290,9 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.3.9"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3"
+checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
 dependencies = [
  "powerfmt",
  "serde",
@@ -3039,6 +3039,12 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
 [[package]]
 name = "num-integer"
 version = "0.1.45"
@@ -4924,7 +4930,7 @@ dependencies = [
 
 [[package]]
 name = "start-os"
-version = "0.3.5-rev.2"
+version = "0.3.5-rev.1"
 dependencies = [
  "aes",
  "async-compression",
@@ -5651,12 +5657,13 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.30"
+version = "0.3.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
+checksum = "9d9c75b47bdff86fa3334a3db91356b8d7d86a9b839dab7d0bdc5c3d3a077618"
 dependencies = [
  "deranged",
  "itoa",
+ "num-conv",
  "powerfmt",
  "serde",
  "time-core",
@@ -5665,16 +5672,17 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
 
 [[package]]
 name = "time-macros"
-version = "0.2.15"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
+checksum = "29aa485584182073ed57fd5004aa09c371f021325014694e432313345865fd04"
 dependencies = [
+ "num-conv",
  "time-core",
 ]
 

core/startos/Cargo.toml

@@ -14,7 +14,7 @@ keywords = [
 name = "start-os"
 readme = "README.md"
 repository = "https://github.com/Start9Labs/start-os"
-version = "0.3.5-rev.2"
+version = "0.3.5-rev.1"
 license = "MIT"
 
 [lib]

core/startos/src/manager/manager_seed.rs

@@ -29,15 +29,7 @@ impl ManagerSeed {
         )
         .await
         {
-            Err(e) if e.kind == ErrorKind::NotFound => {
+            Err(e) if e.kind == ErrorKind::NotFound => (), // Already stopped
-                tracing::info!(
-                    "Command for package {command_id} should already be stopped",
-                    command_id = &self.manifest.id
-                );
-            } // Already stopped
-            Err(e) if e.kind == ErrorKind::Timeout => {
-                tracing::warn!("Command for package {command_id} had to be timed out, but we have dropped which means it should be killed", command_id = &self.manifest.id);
-            } // Already stopped In theory
             a => a?,
         }
         Ok(())

core/startos/src/util/docker.rs

@@ -113,7 +113,6 @@ pub async fn stop_container(
     signal: Option<Signal>,
 ) -> Result<(), Error> {
     let mut cmd = Command::new(CONTAINER_TOOL);
-    let mut cmd = cmd.timeout(timeout);
     cmd.arg("stop");
     if let Some(dur) = timeout {
         cmd.arg("-t").arg(dur.as_secs().to_string());

core/startos/src/version/mod.rs

@@ -15,9 +15,8 @@ mod v0_3_4_3;
 mod v0_3_4_4;
 mod v0_3_5;
 mod v0_3_5_1;
-mod v0_3_5_2;
 
-pub type Current = v0_3_5_2::Version;
+pub type Current = v0_3_5_1::Version;
 
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
 #[serde(untagged)]
@@ -29,7 +28,6 @@ enum Version {
     V0_3_4_4(Wrapper<v0_3_4_4::Version>),
     V0_3_5(Wrapper<v0_3_5::Version>),
     V0_3_5_1(Wrapper<v0_3_5_1::Version>),
-    V0_3_5_2(Wrapper<v0_3_5_2::Version>),
     Other(emver::Version),
 }
 
@@ -52,7 +50,6 @@ impl Version {
             Version::V0_3_4_4(Wrapper(x)) => x.semver(),
             Version::V0_3_5(Wrapper(x)) => x.semver(),
             Version::V0_3_5_1(Wrapper(x)) => x.semver(),
-            Version::V0_3_5_2(Wrapper(x)) => x.semver(),
             Version::Other(x) => x.clone(),
         }
     }
@@ -179,7 +176,6 @@ pub async fn init(db: &PatchDb, secrets: &PgPool) -> Result<(), Error> {
         Version::V0_3_4_4(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?,
         Version::V0_3_5(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?,
         Version::V0_3_5_1(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?,
-        Version::V0_3_5_2(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?,
         Version::Other(_) => {
             return Err(Error::new(
                 eyre!("Cannot downgrade"),
@@ -219,7 +215,6 @@ mod tests {
             Just(Version::V0_3_4_4(Wrapper(v0_3_4_4::Version::new()))),
             Just(Version::V0_3_5(Wrapper(v0_3_5::Version::new()))),
             Just(Version::V0_3_5_1(Wrapper(v0_3_5_1::Version::new()))),
-            Just(Version::V0_3_5_2(Wrapper(v0_3_5_2::Version::new()))),
             em_version().prop_map(Version::Other),
         ]
     }

core/startos/src/version/v0_3_5_2.rs

@@ -1,32 +0,0 @@
-use async_trait::async_trait;
-use emver::VersionRange;
-use sqlx::PgPool;
-
-use super::VersionT;
-use super::{v0_3_4::V0_3_0_COMPAT, v0_3_5_1};
-use crate::prelude::*;
-
-const V0_3_5_2: emver::Version = emver::Version::new(0, 3, 5, 2);
-
-#[derive(Clone, Debug)]
-pub struct Version;
-
-#[async_trait]
-impl VersionT for Version {
-    type Previous = v0_3_5_1::Version;
-    fn new() -> Self {
-        Version
-    }
-    fn semver(&self) -> emver::Version {
-        V0_3_5_2
-    }
-    fn compat(&self) -> &'static VersionRange {
-        &V0_3_0_COMPAT
-    }
-    async fn up(&self, _db: PatchDb, _secrets: &PgPool) -> Result<(), Error> {
-        Ok(())
-    }
-    async fn down(&self, _db: PatchDb, _secrets: &PgPool) -> Result<(), Error> {
-        Ok(())
-    }
-}

image-recipe/build.sh

@@ -158,8 +158,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 http://deb.debian.org/debian/ trixie main contrib" > config/archives/trixie.list
-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
+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
 

web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "startos-ui",
-  "version": "0.3.5.2",
+  "version": "0.3.5.1",
   "author": "Start9 Labs, Inc",
   "homepage": "https://start9.com/",
   "scripts": {

web/patchdb-ui-seed.json

@@ -1,6 +1,6 @@
 {
   "name": null,
-  "ack-welcome": "0.3.5.2",
+  "ack-welcome": "0.3.5.1",
   "marketplace": {
     "selected-url": "https://registry.start9.com/",
     "known-hosts": {

web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html

@@ -12,11 +12,11 @@
 <ion-content class="ion-padding">
   <h2>This Release</h2>
 
-  <h4>0.3.5.2</h4>
+  <h4>0.3.5.1</h4>
   <p class="note-padding">
     View the complete
     <a
-      href="https://github.com/Start9Labs/start-os/releases/tag/v0.3.5.2"
+      href="https://github.com/Start9Labs/start-os/releases/tag/v0.3.5.1"
       target="_blank"
       noreferrer
     >
@@ -32,19 +32,6 @@
 
   <h2>Previous 0.3.5.x Releases</h2>
 
-  <h4>0.3.5.1</h4>
-  <p class="note-padding">
-    View the complete
-    <a
-      href="https://github.com/Start9Labs/start-os/releases/tag/v0.3.5.1"
-      target="_blank"
-      noreferrer
-    >
-      release notes
-    </a>
-    for more details.
-  </p>
-
   <h4>0.3.5</h4>
   <p class="note-padding">
     View the complete

web/projects/ui/src/app/services/api/api.fixures.ts

@@ -21,10 +21,9 @@ export module Mock {
     'shutting-down': false,
   }
   export const MarketplaceEos: RR.GetMarketplaceEosRes = {
-    version: '0.3.5.2',
+    version: '0.3.5.1',
     headline: 'Our biggest release ever.',
     'release-notes': {
-      '0.3.5.2': 'Some **Markdown** release _notes_ for 0.3.5.2',
       '0.3.5.1': 'Some **Markdown** release _notes_ for 0.3.5.1',
       '0.3.4.4': 'Some **Markdown** release _notes_ for 0.3.4.4',
       '0.3.4.3': 'Some **Markdown** release _notes_ for 0.3.4.3',

web/projects/ui/src/app/services/api/mock-patch.ts

@@ -42,7 +42,7 @@ export const mockPatchData: DataModel = {
   },
   'server-info': {
     id: 'abcdefgh',
-    version: '0.3.5.2',
+    version: '0.3.5.1',
     'last-backup': new Date(new Date().valueOf() - 604800001).toISOString(),
     'lan-address': 'https://adjective-noun.local',
     'tor-address': 'https://myveryownspecialtoraddress.onion',