From 7f6897127b7030fecedf09912af02fc82025ff8138ef98f1c971bdfacf283de1 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 26 Jul 2019 10:37:52 +0000 Subject: [PATCH] Accepting request 718500 from devel:kubic OBS-URL: https://build.opensuse.org/request/show/718500 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/podman?expand=0&rev=45 --- _service | 4 +-- libpod.conf | 18 ++++++++++-- podman-1.4.2.tar.xz | 3 -- podman-1.4.4.tar.xz | 3 ++ podman.changes | 70 +++++++++++++++++++++++++++++++++++++++++++++ podman.spec | 12 +++++++- 6 files changed, 102 insertions(+), 8 deletions(-) delete mode 100644 podman-1.4.2.tar.xz create mode 100644 podman-1.4.4.tar.xz diff --git a/_service b/_service index 5d3a83d..06609ec 100644 --- a/_service +++ b/_service @@ -4,8 +4,8 @@ https://github.com/containers/libpod.git git podman -1.4.2 -v1.4.2 +1.4.4 +v1.4.4 diff --git a/libpod.conf b/libpod.conf index 1091c91..c756b80 100644 --- a/libpod.conf +++ b/libpod.conf @@ -63,10 +63,10 @@ cni_default_network = "podman" #namespace = "" # Default infra (pause) image name for pod infra containers -infra_image = "k8s.gcr.io/pause:3.1" +infra_image = "registry.opensuse.org/kubic/pause:3.1" # Default command to run the infra container -infra_command = "/pause" +infra_command = "/usr/bin/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,9 @@ infra_command = "/pause" # Default libpod support for container labeling # label=true +# The locking mechanism to use +lock_type = "shm" + # 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). @@ -94,9 +97,20 @@ num_locks = 2048 # are `journald` or `file`. # events_logger = "journald" +# Specify the keys sequence used to detach a container. +# Format is a single character [a-Z] or a comma separated sequence of +# `ctrl-`, where `` is one of: +# `a-z`, `@`, `^`, `[`, `\`, `]`, `^` or `_` +# +# detach_keys = "ctrl-p,ctrl-q" + # Default OCI runtime runtime = "runc" +# List of the OCI runtimes that support --format=json. When json is supported +# libpod will use it for reporting nicer errors. +runtime_supports_json = ["runc"] + # Paths to look for a valid OCI runtime (runc, runv, etc) [runtimes] runc = [ diff --git a/podman-1.4.2.tar.xz b/podman-1.4.2.tar.xz deleted file mode 100644 index c0870cd..0000000 --- a/podman-1.4.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f38746655050a342257ca796076f3c31ec259705b1f71307d3f9e403f189b0c8 -size 3831512 diff --git a/podman-1.4.4.tar.xz b/podman-1.4.4.tar.xz new file mode 100644 index 0000000..6e04805 --- /dev/null +++ b/podman-1.4.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a78aa808b3e99839db0ec90023f73c1ecead994c4b673081e6db98ea7c3f0ea5 +size 4418564 diff --git a/podman.changes b/podman.changes index 6d5b4ad..923f3b9 100644 --- a/podman.changes +++ b/podman.changes @@ -1,3 +1,73 @@ +------------------------------------------------------------------- +Thu Jul 25 09:20:47 UTC 2019 - Richard Brown + +- Update libpod.conf to use correct infra_command + +------------------------------------------------------------------- +Thu Jul 18 10:12:43 UTC 2019 - Richard Brown + +- Update libpod.conf to use better versioned pause container + +------------------------------------------------------------------- +Wed Jul 17 14:53:38 UTC 2019 - Richard Brown + +- Update libpod.conf to use official kubic pause container + +------------------------------------------------------------------- +Wed Jul 10 13:55:09 UTC 2019 - Marco Vedovati + +- Update libpod.conf to match latest features set: + detach_keys, lock_type, runtime_supports_json + +------------------------------------------------------------------- +Mon Jul 8 10:46:43 UTC 2019 - Marco Vedovati + +- Add podman-remote varlink client +- Update podman to v1.4.4 + * Features + - Podman now has greatly improved support for containers using multiple OCI + runtimes. Containers now remember if they were created with a different + runtime using --runtime and will always use that runtime + - The cached and delegated options for volume mounts are now allowed for + Docker compatability (#3340) + - The podman diff command now supports the --latest flag + * Bugfixes + - Fixed a bug where rootless Podman would attempt to use the entire root + configuration if no rootless configuration was present for the user, + breaking rootless Podman for new installations + - Fixed a bug where rootless Podman's pause process would block SIGTERM, + preventing graceful system shutdown and hanging until the system's init + send SIGKILL + - Fixed a bug where running Podman as root with sudo -E would not work after + running rootless Podman at least once + - Fixed a bug where options for tmpfs volumes added with the --tmpfs flag + were being ignored + - Fixed a bug where images with no layers could not properly be displayed + and removed by Podman + - Fixed a bug where locks were not properly freed on failure to create a + container or pod + - Fixed a bug where podman cp on a single file would create a directory at + the target and place the file in it (#3384) + - Fixed a bug where podman inspect --format '{{.Mounts}}' would print a + hexadecimal address instead of a container's mounts + - Fixed a bug where rootless Podman would not add an entry to container's + /etc/hosts files for their own hostname (#3405) + - Fixed a bug where podman ps --sync would segfault (#3411) + - Fixed a bug where podman generate kube would produce an invalid ports + configuration (#3408) + * Misc + - Updated containers/storage to v1.12.13 + - Podman now performs much better on systems with heavy I/O load + - The --cgroup-manager flag to podman now shows the correct default setting + in help if the default was overridden by libpod.conf + - For backwards compatability, setting --log-driver=json-file in podman run + is now supported as an alias for --log-driver=k8s-file. This is considered + deprecated, and json-file will be moved to a new implementation in the + future ([#3363](https://github.com/containers/libpo\ + d/issues/3363)) + - Podman's default libpod.conf file now allows the crun OCI runtime to be + used if it is installed + ------------------------------------------------------------------- Wed Jun 26 11:24:32 UTC 2019 - Robert Frohl diff --git a/podman.spec b/podman.spec index 010fe7c..2a1723d 100644 --- a/podman.spec +++ b/podman.spec @@ -24,7 +24,7 @@ %define with_libostree 1 %endif Name: podman -Version: 1.4.2 +Version: 1.4.4 Release: 0 Summary: Daemon-less container engine for managing containers, pods and images License: Apache-2.0 @@ -86,6 +86,7 @@ skopeo, as they all share the same datastore backend. %setup -q # unpack conmon into the unpacked podman source %setup -q -T -D -a 1 +rm -rf $HOME/%{conmon_project} mkdir -pv $HOME/%{conmon_project} mv %{conmon_project}-%{conmonver}/* $HOME/%{conmon_project} rm -r %{conmon_project}-%{conmonver} @@ -127,6 +128,13 @@ go build -tags "$BUILDTAGS" \ -o bin/podman \ %{project}/cmd/podman +# Build remote client +go build -tags "$BUILDTAGS remoteclient" \ + -buildmode=pie \ + -ldflags '-s -w -X main.podmanVersion=%{version}' \ + -o bin/podman-remote \ + %{project}/cmd/podman + # Build manpages make %{?_smp_mflags} docs @@ -143,6 +151,7 @@ make # libpod cd $HOME/go/src/%{project} install -D -m 0755 bin/podman %{buildroot}/%{_bindir}/podman +install -D -m 0755 bin/podman-remote %{buildroot}/%{_bindir}/podman-remote install -d %{buildroot}/%{_mandir}/man1 install -m 0644 docs/podman*.1 %{buildroot}/%{_mandir}/man1 install -d %{buildroot}/%{_mandir}/man5 @@ -166,6 +175,7 @@ install -D -m 0755 bin/conmon %{buildroot}/%{_libexecdir}/podman/bin/conmon %files # Binaries %{_bindir}/podman +%{_bindir}/podman-remote %dir %{_libexecdir}/podman %dir %{_libexecdir}/podman/bin %{_libexecdir}/podman/bin/conmon