diff --git a/.gitignore b/.gitignore index 5198672..92b8423 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ SOURCES/podman-machine-cni-0749884.tar.gz SOURCES/v0.1.0.tar.gz SOURCES/v0.1.7.tar.gz SOURCES/v1.3.0.tar.gz -SOURCES/v3.4-e3a7a74.tar.gz +SOURCES/v3.4-63134a1.tar.gz diff --git a/.podman.metadata b/.podman.metadata index ed48370..c8ff1f7 100644 --- a/.podman.metadata +++ b/.podman.metadata @@ -2,4 +2,4 @@ d2be14e364fef2d95c61cdac528219548640f6d4 SOURCES/v0.1.0.tar.gz 94419a237f932ff2a79c91f6e3005034d9c367a5 SOURCES/v0.1.7.tar.gz 667dcf5bea5992e18963bac6b833053a0d8b1eaa SOURCES/v1.3.0.tar.gz -66a2d2618bea9b4b4371cc2b6543075ecb2fb9aa SOURCES/v3.4-e3a7a74.tar.gz +6ca6091f4f21ae2e3f5990d97281e61c72a0c917 SOURCES/v3.4-63134a1.tar.gz diff --git a/SOURCES/12118.patch b/SOURCES/12118.patch deleted file mode 100644 index ae5c1bf..0000000 --- a/SOURCES/12118.patch +++ /dev/null @@ -1,113 +0,0 @@ -From e68fbf03aa4e117e769b479d5a83a4bbc0628a33 Mon Sep 17 00:00:00 2001 -From: Hironori Shiina -Date: Wed, 27 Oct 2021 09:26:58 -0400 -Subject: [PATCH] Set flags to test 'logs -f' with journald driver - -`logs -f` with `journald` is supported only when `journald` events -backend is used. To pass system tests using `logs -f` in an environment -where `events_logger` is not set to `journald` in `containers.conf`, -this fix sets `--events-backend` or `--log-driver` temporally. - -Signed-off-by: Hironori Shiina ---- - test/system/035-logs.bats | 28 +++++++++++++++++++++++----- - test/system/130-kill.bats | 15 ++++++++++++++- - 2 files changed, 37 insertions(+), 6 deletions(-) - -diff --git a/test/system/035-logs.bats b/test/system/035-logs.bats -index 44b66676eeb..7fb3e62e459 100644 ---- a/test/system/035-logs.bats -+++ b/test/system/035-logs.bats -@@ -30,6 +30,17 @@ load helpers - run_podman rm $cid - } - -+function _additional_events_backend() { -+ local driver=$1 -+ # Since PR#10431, 'logs -f' with journald driver is only supported with journald events backend. -+ if [[ $driver = "journald" ]]; then -+ run_podman info --format '{{.Host.EventLogger}}' >/dev/null -+ if [[ $output != "journald" ]]; then -+ echo "--events-backend journald" -+ fi -+ fi -+} -+ - function _log_test_multi() { - local driver=$1 - -@@ -42,10 +53,12 @@ function _log_test_multi() { - etc='.*' - fi - -+ local events_backend=$(_additional_events_backend $driver) -+ - # Simple helper to make the container starts, below, easier to read - local -a cid - doit() { -- run_podman run --log-driver=$driver --rm -d --name "$1" $IMAGE sh -c "$2"; -+ run_podman ${events_backend} run --log-driver=$driver --rm -d --name "$1" $IMAGE sh -c "$2"; - cid+=($(echo "${output:0:12}")) - } - -@@ -57,7 +70,7 @@ function _log_test_multi() { - doit c1 "echo a;sleep 10;echo d;sleep 3" - doit c2 "sleep 1;echo b;sleep 2;echo c;sleep 3" - -- run_podman logs -f c1 c2 -+ run_podman ${events_backend} logs -f c1 c2 - is "$output" \ - "${cid[0]} a$etc - ${cid[1]} b$etc -@@ -187,15 +200,20 @@ function _log_test_follow() { - contentA=$(random_string) - contentB=$(random_string) - contentC=$(random_string) -+ local events_backend=$(_additional_events_backend $driver) -+ -+ if [[ -n "${events_backend}" ]]; then -+ skip_if_remote "remote does not support --events-backend" -+ fi - - # Note: it seems we need at least three log lines to hit #11461. -- run_podman run --log-driver=$driver --name $cname $IMAGE sh -c "echo $contentA; echo $contentB; echo $contentC" -- run_podman logs -f $cname -+ run_podman ${events_backend} run --log-driver=$driver --name $cname $IMAGE sh -c "echo $contentA; echo $contentB; echo $contentC" -+ run_podman ${events_backend} logs -f $cname - is "$output" "$contentA - $contentB - $contentC" "logs -f on exitted container works" - -- run_podman rm -f $cname -+ run_podman ${events_backend} rm -f $cname - } - - @test "podman logs - --follow k8s-file" { -diff --git a/test/system/130-kill.bats b/test/system/130-kill.bats -index d85f0a6a998..1ff3a7b6199 100644 ---- a/test/system/130-kill.bats -+++ b/test/system/130-kill.bats -@@ -6,9 +6,22 @@ - load helpers - - @test "podman kill - test signal handling in containers" { -+ -+ # Prepare for 'logs -f' -+ run_podman info --format '{{.Host.LogDriver}}' -+ log_driver=$output -+ run_podman info --format '{{.Host.EventLogger}}' -+ event_logger=$output -+ opt_log_driver= -+ if [ $log_driver = "journald" ] && [ $event_logger != "journald" ]; then -+ # Since PR#10431, 'logs -f' with journald driver is only supported with journald events backend. -+ # Set '--log driver' temporally because remote doesn't support '--events-backend'. -+ opt_log_driver="--log-driver k8s-file" -+ fi -+ - # Start a container that will handle all signals by emitting 'got: N' - local -a signals=(1 2 3 4 5 6 8 10 12 13 14 15 16 20 21 22 23 24 25 26 64) -- run_podman run -d $IMAGE sh -c \ -+ run_podman run -d ${opt_log_driver} $IMAGE sh -c \ - "for i in ${signals[*]}; do trap \"echo got: \$i\" \$i; done; - echo READY; - while ! test -e /stop; do sleep 0.05; done; diff --git a/SPECS/podman.spec b/SPECS/podman.spec index 420c70d..827abcb 100644 --- a/SPECS/podman.spec +++ b/SPECS/podman.spec @@ -17,7 +17,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl %global import_path github.com/containers/podman %global branch v3.4 -%global commit0 e3a7a743c50f7131fde98380b8059c463468c653 +%global commit0 63134a1ef8e85395fb0aedbe966fb6b4f1d91470 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global cataver 0.1.7 %global dnsnamever 1.3.0 @@ -26,10 +26,10 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl %global commit_mcni 0749884b8d1a455c68da30789e37811ec0809d51 %global shortcommit_mcni %(c=%{commit_mcni}; echo ${c:0:7}) -Epoch: 1 +Epoch: 2 Name: podman -Version: 3.4.3 -Release: 0.6%{?dist} +Version: 3.4.5 +Release: 0.7%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 and GPLv3+ URL: https://%{name}.io/ @@ -42,8 +42,6 @@ Source1: https://github.com/openSUSE/catatonit/archive/v%{cataver}.tar.gz Source2: https://github.com/containers/dnsname/archive/v%{dnsnamever}.tar.gz Source3: https://github.com/containers/%{name}-machine-cni/archive/%{commit_mcni}/%{name}-machine-cni-%{shortcommit_mcni}.tar.gz Source4: https://github.com/containers/%{gvproxyrepo}/archive/v%{gvproxyver}.tar.gz -# backported: https://patch-diff.githubusercontent.com/raw/containers/podman/pull/12118.patch -Patch0: 12118.patch # https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures ExclusiveArch: %{go_arches} Provides: %{name}-manpages = %{epoch}:%{version}-%{release} @@ -162,6 +160,7 @@ Requires: skopeo Requires: openssl Requires: buildah Requires: gnupg +Requires: git-daemon %description tests %{summary} @@ -404,6 +403,70 @@ exit 0 %{_libexecdir}/%{name}/gvproxy %changelog +* Wed Jan 19 2022 Jindrich Novy - 2:3.4.5-0.7 +- add rootless_role (Ed Santiago) +- Related: #2000051 + +* Mon Jan 17 2022 Jindrich Novy - 2:3.4.5-0.6 +- add git-daemon to test subpackage + (https://github.com/containers/podman/issues/12851) +- Related: #2000051 + +* Thu Jan 13 2022 Jindrich Novy - 2:3.4.5-0.5 +- update to the latest content of https://github.com/containers/podman/tree/v3.4 + (https://github.com/containers/podman/commit/63134a1) +- Related: #2000051 + +* Tue Jan 11 2022 Jindrich Novy - 2:3.4.5-0.4 +- update to the latest content of https://github.com/containers/podman/tree/v3.4 + (https://github.com/containers/podman/commit/3f57b6e) +- Related: #2000051 + +* Fri Dec 17 2021 Jindrich Novy - 2:3.4.5-0.3 +- update to the latest content of https://github.com/containers/podman/tree/v3.4 + (https://github.com/containers/podman/commit/17788ed) +- Related: #2000051 + +* Thu Dec 09 2021 Jindrich Novy - 2:3.4.5-0.2 +- incorporate gating test fixes from Ed Santiago: + - remove buildah and skopeo (unused) + - bump BATS from v1.1 to v1.5 + - rename "nonroot" to "rootless" +- Related: #2000051 + +* Thu Dec 09 2021 Jindrich Novy - 2:3.4.5-0.1 +- update to the latest content of https://github.com/containers/podman/tree/v3.4 + (https://github.com/containers/podman/commit/b8fde5c) +- Related: #2000051 + +* Tue Dec 07 2021 Jindrich Novy - 2:3.4.4-0.1 +- update to the latest content of https://github.com/containers/podman/tree/v3.4 + (https://github.com/containers/podman/commit/49f589d) +- Related: #2000051 + +* Tue Dec 07 2021 Jindrich Novy - 2:3.4.3-0.11 +- remove downstream patch already applied upstream +- Related: #2000051 + +* Mon Dec 06 2021 Jindrich Novy - 2:3.4.3-0.10 +- update to the latest content of https://github.com/containers/podman/tree/v3.4 + (https://github.com/containers/podman/commit/fe44757) +- Related: #2000051 + +* Thu Dec 02 2021 Jindrich Novy - 2:3.4.3-0.9 +- update to the latest content of https://github.com/containers/podman/tree/v3.4 + (https://github.com/containers/podman/commit/815f36a) +- Related: #2000051 + +* Wed Dec 01 2021 Jindrich Novy - 2:3.4.3-0.8 +- update to the latest content of https://github.com/containers/podman/tree/v3.4 + (https://github.com/containers/podman/commit/31bc358) +- Related: #2000051 + +* Tue Nov 30 2021 Jindrich Novy - 2:3.4.3-0.7 +- bump Epoch to not to pull in older versions built off upstream main branch +- Related: #2000051 + * Tue Nov 23 2021 Jindrich Novy - 1:3.4.3-0.6 - update to the latest content of https://github.com/containers/podman/tree/v3.4 (https://github.com/containers/podman/commit/e3a7a74)