From 41faadc915a872239dd479b8291d382ec0724c8d Mon Sep 17 00:00:00 2001 From: xtex Date: Sun, 10 Sep 2023 14:01:24 +0800 Subject: [PATCH 1/4] Add missing derives to container opts Signed-off-by: xtex --- src/opts/containers.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/opts/containers.rs b/src/opts/containers.rs index e803b1f..c094975 100644 --- a/src/opts/containers.rs +++ b/src/opts/containers.rs @@ -6,6 +6,7 @@ use containers_api::{ impl_str_field, impl_url_bool_field, impl_url_field, impl_url_str_field, impl_url_vec_field, impl_vec_field, }; +use serde::{Deserialize, Serialize}; use std::fmt; impl_opts_builder!(url => @@ -318,7 +319,7 @@ impl fmt::Display for ImageVolumeMode { } } -#[derive(Debug, Clone, Copy, PartialEq, Eq)] +#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)] /// How to handle the `NOTIFY_SOCKET`. Used with /// [`sdnotify_mode`](ContainerCreateOptsBuilder::sdnotify_mode). pub enum SocketNotifyMode { @@ -346,7 +347,7 @@ impl fmt::Display for SocketNotifyMode { } } -#[derive(Debug, Clone, Copy, PartialEq, Eq)] +#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)] /// Used with [`ContainerCreateOptsBuilder::seccomp_policy`](ContainerCreateOptsBuilder::seccomp_policy). #[derive(Default)] pub enum SeccompPolicy { @@ -372,7 +373,7 @@ impl fmt::Display for SeccompPolicy { } } -#[derive(Debug, Clone, Copy, PartialEq, Eq)] +#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)] /// Used with [`ContainerCreateOptsBuilder::systemd`](ContainerCreateOptsBuilder::systemd). #[derive(Default)] pub enum SystemdEnabled { @@ -398,7 +399,7 @@ impl fmt::Display for SystemdEnabled { } } -#[derive(Debug, Clone, Copy, PartialEq, Eq)] +#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)] /// Used with /// [`ContainerCreateOptsBuilder::restart_policy`](ContainerCreateOptsBuilder::restart_policy). #[derive(Default)] From 61c3826992e4d04f63646c08a76ae8af259e8d23 Mon Sep 17 00:00:00 2001 From: xtex Date: Sun, 10 Sep 2023 14:12:18 +0800 Subject: [PATCH 2/4] Add more derives to ImageVolumeMode and SocketNotifyMode Signed-off-by: xtex --- src/opts/containers.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/opts/containers.rs b/src/opts/containers.rs index c094975..9bcb2c7 100644 --- a/src/opts/containers.rs +++ b/src/opts/containers.rs @@ -289,7 +289,7 @@ impl_opts_builder!(json => ContainerCreate ); -#[derive(Debug, Clone, Copy, PartialEq, Eq)] +#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)] /// Mode used to configure image volume with /// [`image_volume_mode`](ContainerCreateOptsBuilder::image_volume_mode). #[derive(Default)] @@ -322,8 +322,10 @@ impl fmt::Display for ImageVolumeMode { #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)] /// How to handle the `NOTIFY_SOCKET`. Used with /// [`sdnotify_mode`](ContainerCreateOptsBuilder::sdnotify_mode). +#[derive(Default)] pub enum SocketNotifyMode { /// Let the OCI runtime deal with it, advertise conmon's MAINPID. + #[default] Container, /// Advertise conmon's MAINPID, send READY when started, don't pass to OCI. Conmon, From 53056cbd15c21f69199cf7be7cfbcc38de624872 Mon Sep 17 00:00:00 2001 From: xtex Date: Sun, 10 Sep 2023 14:15:19 +0800 Subject: [PATCH 3/4] Run test CI with podman 4.5 Signed-off-by: xtex --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ce05e46..fd10dfa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,7 +43,7 @@ jobs: echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_22.04/ /' | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list curl -fsSL https://download.opensuse.org/repositories/devel:kubic:libcontainers:unstable/xUbuntu_22.04/Release.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/devel_kubic_libcontainers_unstable.gpg > /dev/null sudo apt -y update - sudo apt -y install 'podman=4:4.4*' + sudo apt -y install 'podman=4:4.5*' - name: Start podman run: | systemctl restart --user podman From 7e6b7c293bc5fe88386bf7d7c2e7e3932e03f194 Mon Sep 17 00:00:00 2001 From: xtex Date: Sun, 10 Sep 2023 14:31:01 +0800 Subject: [PATCH 4/4] Revert "Run test CI with podman 4.5" This reverts commit 53056cbd15c21f69199cf7be7cfbcc38de624872. --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fd10dfa..ce05e46 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,7 +43,7 @@ jobs: echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_22.04/ /' | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list curl -fsSL https://download.opensuse.org/repositories/devel:kubic:libcontainers:unstable/xUbuntu_22.04/Release.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/devel_kubic_libcontainers_unstable.gpg > /dev/null sudo apt -y update - sudo apt -y install 'podman=4:4.5*' + sudo apt -y install 'podman=4:4.4*' - name: Start podman run: | systemctl restart --user podman