Update to latest Compose spec

CHANGELOG.md

@@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Update the `--volumes` flag description in the `down` command to properly reflect that it does not remove named volumes.
+- Add support for `cgroup` and `uts` in service definition.
+- Make `network_mode` and `networks` mutually exclusive attributes.
 
 ## [0.1.7] - 2023-03-31
 

Cargo.toml

@@ -9,7 +9,7 @@ keywords = ["podman", "compose", "docker", "docker-compose"]
 categories = ["command-line-utilities"]
 
 [dependencies]
-anyhow = "1.0.70"
+anyhow = "1.0.71"
 atty = "0.2.14"
 automod = "1.0.8"
 byte-unit = { version = "4.0.19", default-features = false, features = ["serde", "std"] }

src/compose.rs

@@ -361,6 +361,10 @@ pub(crate) fn parse(config: &Config, no_interpolate: bool) -> Result<Compose> {
             bail!("Service \"{name}\" does not have an image specified");
         }
 
+        if service.network_mode.is_some() && service.networks.keys().any(|key| key != "default") {
+            bail!("Service \"{name}\" cannot have networks due to the network mode set");
+        }
+
         if service.network_mode.as_deref().unwrap_or_default() == "host"
             && !service.ports.is_empty()
         {

src/compose/types.rs

@@ -79,6 +79,7 @@ pub(crate) struct Service {
     pub(crate) blkio_config: Option<BlkioConfig>,
     pub(crate) cap_add: Vec<String>,
     pub(crate) cap_drop: Vec<String>,
+    pub(crate) cgroup: Option<String>,
     pub(crate) cgroup_parent: Option<String>,
     #[serde_as(as = "PickFirst<(_, CommandOrString)>")]
     pub(crate) command: Vec<String>,
@@ -173,6 +174,7 @@ pub(crate) struct Service {
     pub(crate) ulimits: IndexMap<String, ResourceLimit>,
     pub(crate) user: Option<String>,
     pub(crate) userns_mode: Option<String>,
+    pub(crate) uts: Option<String>,
     #[serde_as(as = "SetLastValueWins<PickFirst<(_, ServiceVolumeOrString)>>")]
     pub(crate) volumes: IndexSet<ServiceVolume>,
     pub(crate) volumes_from: Vec<String>,
@@ -267,6 +269,10 @@ impl Service {
             args.extend([String::from("--cap-drop"), cap_drop]);
         }
 
+        if let Some(cgroup) = self.cgroup.as_ref().cloned() {
+            args.extend([String::from("--cgroupns"), cgroup]);
+        }
+
         if let Some(cgroup_parent) = self.cgroup_parent.as_ref().cloned() {
             args.extend([String::from("--cgroup-parent"), cgroup_parent]);
         }
@@ -594,6 +600,10 @@ impl Service {
             args.extend([String::from("--userns"), userns_mode]);
         }
 
+        if let Some(uts) = self.uts.as_ref().cloned() {
+            args.extend([String::from("--uts"), uts]);
+        }
+
         for volume in self.volumes_from.iter().cloned() {
             args.extend([String::from("--volumes-from"), volume]);
         }