rpm/podman
SHA256
1
0
Fork 0
forked from pool/podman
Code Pull Requests Activity

Accepting request 704933 from devel:kubic

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/704933
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/podman?expand=0&rev=42
This commit is contained in:
Dominique Leuenberger 2019-05-27 06:35:26 +00:00 committed by Git OBS Bridge
parent 6cf35c19a4
commit 5bf5430b1b
8 changed files with 117 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
_service
View File

@ -4,8 +4,8 @@
<param name="url">https://github.com/containers/libpod.git</param>
<param name="scm">git</param>
<param name="filename">podman</param>
<param name="versionformat">1.2.0</param>
<param name="revision">v1.2.0</param>
<param name="versionformat">1.3.1</param>
<param name="revision">v1.3.1</param>
</service>
<service name="set_version" mode="disabled">
@ -13,11 +13,11 @@
</service>
<service name="tar_scm" mode="disabled">
<param name="url">https://github.com/kubernetes-sigs/cri-o.git</param>
<param name="url">https://github.com/containers/conmon.git</param>
<param name="scm">git</param>
<param name="filename">conmon</param>
<param name="versionformat">1.14.0</param>
<param name="revision">v1.14.0</param>
<param name="versionformat">0.2.0</param>
<param name="revision">v0.2.0</param>
</service>
<service name="recompress" mode="disabled">

3
conmon-0.2.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b252d218765f1e9e0a562ddd259db4dbcc9519c60e2b11ecad2b84fae64fea37
size 42648

3
conmon-1.14.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6a9b75593fd91508222dd539bcbe8deeb0a639d583b88c9c3368f2a2578bc52e
size 5052084

23
libpod.conf
View File

@ -62,11 +62,11 @@ cni_default_network = "podman"
# namespace is set, all containers and pods are visible.
#namespace = ""
## Default pause image name for pod pause containers
pause_image = "k8s.gcr.io/pause:3.1"
# Default infra (pause) image name for pod infra containers
infra_image = "k8s.gcr.io/pause:3.1"
# Default command to run the pause container
pause_command = "/pause"
# Default command to run the infra container
infra_command = "/pause"
# Determines whether libpod will reserve ports on the host when they are
# forwarded to containers. When enabled, when ports are forwarded to containers,
@ -79,6 +79,17 @@ pause_command = "/pause"
# Default libpod support for container labeling
# label=true
# Number of locks available for containers and pods.
# If this is changed, a lock renumber must be performed (e.g. with the
# 'podman system renumber' command).
num_locks = 2048
# Directory for libpod named volumes.
# By default, this will be configured relative to where containers/storage
# stores containers.
# Uncomment to change location from this default.
#volume_path = "/var/lib/containers/storage/volumes"
# Default OCI runtime
runtime = "runc"
@ -88,3 +99,7 @@ runc = [
"/usr/bin/runc",
"/usr/sbin/runc"
]
# Selects which logging mechanism to use for Podman events. Valid values
# are `journald` or `file`.
# events_logger = "journald"

3
podman-1.2.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:61eee4e10c191018426e59856d0cfbdb681bd45a0c76bdf4fc8cfe36e7a1ff51
size 4325556

3
podman-1.3.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6b204dd3ebc519d0bd13624c2411e9dbfc0c4895cddc99239581c2ff44bc50d5
size 3812924

72
podman.changes
View File

@ -1,3 +1,71 @@
-------------------------------------------------------------------
Wed May 22 07:04:24 UTC 2019 - Sascha Grunert <sgrunert@suse.com>
- Update podman to v1.3.1:
- The podman cp command can now read input redirected to STDIN, and output to
STDOUT instead of a file, using - instead of an argument.
- The Podman remote client now displays version information from both the
client and server in podman version
- The podman unshare command has been added, allowing easy entry into the
user namespace set up by rootless Podman (allowing the removal of files
created by rootless Podman, among other things)
- Fixed a bug where Podman containers with the --rm flag were removing
created volumes when they were automatically removed
- Fixed a bug where container and pod locks were incorrectly marked as
released after a system reboot, causing errors on container and pod removal
- Fixed a bug where Podman pods could not be removed if any container in the
pod encountered an error during removal
- Fixed a bug where Podman pods run with the cgroupfs CGroup driver would
encounter a race condition during removal, potentially failing to remove
the pod CGroup
- Fixed a bug where the podman container checkpoint and podman container
restore commands were not visible in the remote client
- Fixed a bug where podman remote ps --ns would not print the container's
namespaces
- Fixed a bug where removing stopped containers with healthchecks could cause
an error
- Fixed a bug where the default libpod.conf file was causing parsing errors
- Fixed a bug where pod locks were not being freed when pods were removed,
potentially leading to lock exhaustion
- Fixed a bug where 'podman run' with SD_NOTIFY set could, on short-running
containers, create an inconsistent state rendering the container unusable
- The remote Podman client now uses the Varlink bridge to establish remote
connections by default
- Update conmon to 0.2.0 and switched to containers/conmon upstream project
-------------------------------------------------------------------
Fri May 17 12:08:37 UTC 2019 - Sascha Grunert <sgrunert@suse.com>
- Update `systemd-devel` to actually be `pkgconfig(libsystemd)` to allow OBS to
shortcut through systemd-mini-devel
-------------------------------------------------------------------
Thu May 16 15:04:52 UTC 2019 - Sascha Grunert <sgrunert@suse.com>
- Update podman to v1.3.0
* Podman now supports container restart policies! The --restart-policy flag
on podman create and podman run allows containers to be restarted after
they exit. Please note that Podman cannot restart containers after a system
reboot - for that, see our next feature
* Podman podman generate systemd command was added to generate systemd unit
files for managing Podman containers
* The podman runlabel command now allows a $GLOBAL_OPTS variable, which will
be populated by global options passed to the podman runlabel command,
allowing custom storage configurations to be passed into containers run
with runlabel
* The podman play kube command now allows File and FileOrCreate volumes
* The podman pod prune command was added to prune unused pods
* Added the podman system migrate command to migrate containers using older
configurations to allow their use by newer Libpod versions
* Podman containers now forward proxy-related environment variables from the
host into the container with the --http-proxy flag (enabled by default)
* Read-only Podman containers can now create tmpfs filesystems on /tmp,
/var/tmp, and /run with the --read-only-tmpfs flag (enabled by default)
* The podman init command was added, performing all container pre-start tasks
without starting the container to allow pre-run debugging
- Update conmon to cri-o v1.14.1
- Update libpod.conf to match latest feature set
-------------------------------------------------------------------
Mon Apr 1 14:05:35 UTC 2019 - Richard Brown <rbrown@suse.com>
@ -44,7 +112,7 @@ Sat Mar 16 08:33:38 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
-------------------------------------------------------------------
Fri Mar 8 09:47:25 UTC 2019 - Richard Brown <rbrown@suse.com>
- podman-cni-config: remove artificial conflicts with kubelet
- podman-cni-config: remove artificial conflicts with kubelet
-------------------------------------------------------------------
Thu Mar 7 15:22:22 UTC 2019 - Richard Brown <rbrown@suse.com>
@ -209,7 +277,7 @@ Tue Jan 8 11:20:42 UTC 2019 - Richard Brown <rbrown@suse.com>
-------------------------------------------------------------------
Tue Dec 18 09:40:40 UTC 2018 - Marco Vedovati <mvedovati@suse.com>
- Update package summary and description
- Update package summary and description
-------------------------------------------------------------------
Fri Dec 7 07:42:47 UTC 2018 - Adrian Schröter <adrian@suse.de>

33
podman.spec
View File

@ -17,21 +17,21 @@
%define project github.com/containers/libpod
%define conmon_project github.com/kubernetes-sigs/cri-o
%define conmonver 1.14.0
%define conmon_project conmon
%define conmonver 0.2.0
# Build with libostree-devel in Tumbleweed, Leap 15 and SLES 15
%if 0%{?suse_version} >= 1500
%define with_libostree 1
%endif
Name: podman
Version: 1.2.0
Version: 1.3.1
Release: 0
Summary: Daemon-less container engine for managing containers, pods and images
License: Apache-2.0
Group: System/Management
Url: https://github.com/containers/libpod
Source0: %{name}-%{version}.tar.xz
Source1: conmon-%{conmonver}.tar.xz
Source1: %{conmon_project}-%{conmonver}.tar.xz
Source2: libpod.conf
Source3: %{name}-rpmlintrc
BuildRequires: bash-completion
@ -49,12 +49,13 @@ BuildRequires: libbtrfs-devel
BuildRequires: libcontainers-common
BuildRequires: libgpgme-devel
BuildRequires: libseccomp-devel
BuildRequires: golang(API) >= 1.11
BuildRequires: pkgconfig(libsystemd)
BuildRequires: golang(API) >= 1.12
# Build fails with PIE enabled on ppc64le due to boo#1098017
%ifarch ppc64le
#!BuildIgnore: gcc-PIE
%endif
# i586 not supported, cri-o/conmon does not build
# i586 not supported, containers/conmon does not build
ExcludeArch: i586
Requires: apparmor-parser
Requires: cni
@ -73,20 +74,20 @@ BuildRequires: libostree-devel
%endif
%description
Podman is a container engine for managing pods, containers, and container
images.
It is a standalone tool and it directly manipulates containers without the need
Podman is a container engine for managing pods, containers, and container
images.
It is a standalone tool and it directly manipulates containers without the need
of a container engine daemon.
Podman is able to interact with container images create in buildah, cri-o, and
Podman is able to interact with container images create in buildah, cri-o, and
skopeo, as they all share the same datastore backend.
%prep
%setup -q
# unpack conmon into the unpacked podman source
%setup -q -T -D -a 1
mkdir -pv $HOME/go/src/%{conmon_project}
mv conmon-%{conmonver}/* $HOME/go/src/%{conmon_project}
rm -r conmon-%{conmonver}
mkdir -pv $HOME/%{conmon_project}
mv %{conmon_project}-%{conmonver}/* $HOME/%{conmon_project}
rm -r %{conmon_project}-%{conmonver}
%package cni-config
Summary: Basic CNI configuration for podman
@ -129,8 +130,8 @@ go build -tags "$BUILDTAGS" \
make %{?_smp_mflags} docs
# Build conmon
cd $HOME/go/src/%{conmon_project}
make -C conmon
cd $HOME/%{conmon_project}
make
%check
# Too many tests fail due to the restricted permissions in the build enviroment.
@ -156,7 +157,7 @@ install -D -m 0644 contrib/varlink/io.podman.service %{buildroot}%{_unitdir}/io.
install -D -m 0644 contrib/varlink/io.podman.socket %{buildroot}%{_unitdir}/io.podman.socket
# conmon
cd $HOME/go/src/%{conmon_project}
cd $HOME/%{conmon_project}
install -D -m 0755 bin/conmon %{buildroot}/%{_libexecdir}/podman/bin/conmon
%fdupes %{buildroot}/%{_prefix}