Hello community,
here is the log from the commit of package python-podman-compose for
openSUSE:Factory checked in at 2020-10-15 13:48:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-podman-compose (Old)
and /work/SRC/openSUSE:Factory/.python-podman-compose.new.3486 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-podman-compose"
Thu Oct 15 13:48:35 2020 rev:2 rq:833485 version:0.1.5
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-podman-compose/python-podman-compose.changes
2019-09-30 15:58:00.725438073 +0200
+++
/work/SRC/openSUSE:Factory/.python-podman-compose.new.3486/python-podman-compose.changes
2020-10-15 13:49:01.373264799 +0200
@@ -1,0 +2,12 @@
+Thu Sep 10 13:39:57 UTC 2020 - Frederic Crozat <fcro...@suse.com>
+
+- Add 0001-Add-support-for-devices-in-a-service.patch: add support
+ for --devices.
+
+-------------------------------------------------------------------
+Thu Sep 10 13:07:51 UTC 2020 - Frederic Crozat <fcro...@suse.com>
+
+- Add 0001-podman-volume-inspect-mountPoint-Mountpoint.patch:
+ ensure new version of podman are supported.
+
+-------------------------------------------------------------------
New:
----
0001-Add-support-for-devices-in-a-service.patch
0001-podman-volume-inspect-mountPoint-Mountpoint.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-podman-compose.spec ++++++
--- /var/tmp/diff_new_pack.uwbXC8/_old 2020-10-15 13:49:03.173265552 +0200
+++ /var/tmp/diff_new_pack.uwbXC8/_new 2020-10-15 13:49:03.177265554 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-podman-compose
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -28,6 +28,10 @@
URL: https://github.com/containers/%{src_name}
Source0:
https://files.pythonhosted.org/packages/source/p/%{src_name}/%{src_name}-%{version}.tar.gz
Source1:
https://raw.githubusercontent.com/containers/%{src_name}/v%{version}/LICENSE
+# PATCH-FIX-UPSTREAM 0001-podman-volume-inspect-mountPoint-Mountpoint.patch
fcro...@suse.com -- handle various podman version
+Patch0: 0001-podman-volume-inspect-mountPoint-Mountpoint.patch
+# PATCH-FIX-UPSTREAM 0001-Add-support-for-devices-in-a-service.patch
fcro...@suse.com -- support --devices
+Patch1: 0001-Add-support-for-devices-in-a-service.patch
BuildRequires: %{python_module PyYAML}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
++++++ 0001-Add-support-for-devices-in-a-service.patch ++++++
>From 751aaa87f6d891149b4563ec8524d8af5e2c1e72 Mon Sep 17 00:00:00 2001
From: Kevin Elliott <ke...@welikeinc.com>
Date: Fri, 13 Sep 2019 12:11:57 -0700
Subject: [PATCH] Add support for devices in a service
---
podman_compose.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/podman_compose.py b/podman_compose.py
index 3e38fc9..86cff62 100755
--- a/podman_compose.py
+++ b/podman_compose.py
@@ -459,6 +459,8 @@ def container_to_args(compose, cnt, detached=True,
podman_command='run'):
if net:
podman_args.extend(['--network', net])
env = norm_as_list(cnt.get('environment', {}))
+ for d in cnt.get('devices', []):
+ podman_args.extend(['--device', d])
for e in env:
podman_args.extend(['-e', e])
for i in cnt.get('env_file', []):
--
2.26.2
++++++ 0001-podman-volume-inspect-mountPoint-Mountpoint.patch ++++++
>From a9216c3980233289eb8d26bd514e0803392e3906 Mon Sep 17 00:00:00 2001
From: Simon Li <orpheus+de...@gmail.com>
Date: Sat, 5 Oct 2019 21:26:53 +0100
Subject: [PATCH] podman volume inspect mountPoint/Mountpoint
podman version 1.6.1 volume inspect outputs Mountpoint instead of mountPoint
---
podman_compose.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
Index: podman-compose-0.1.5/podman_compose.py
===================================================================
--- podman-compose-0.1.5.orig/podman_compose.py 2020-09-10 15:09:26.308833372
+0200
+++ podman-compose-0.1.5/podman_compose.py 2020-09-10 15:15:51.332846378
+0200
@@ -363,7 +362,10 @@
except subprocess.CalledProcessError:
compose.podman.output(["volume", "create", "-l",
"io.podman.compose.project={}".format(proj_name), vol_name])
out = compose.podman.output(["volume", "inspect", vol_name])
+ try:
- src = json.loads(out)[0]["mountPoint"]
+ src = json.loads(out)[0]["mountpoint"]
+ except KeyError:
+ src = json.loads(out)[0]["Mountpoint"]
ret=dict(mount_dict, type="bind", source=src, _vol=vol_name)
bind_prop=ret.get("bind", {}).get("propagation")
if not bind_prop:
