7 files changed, 42 insertions, 5 deletions
diff --git a/contrib/cirrus/integration_test.sh b/contrib/cirrus/integration_test.sh
index 20e067c93..6341bcb4a 100755
--- a/contrib/cirrus/integration_test.sh
+++ b/contrib/cirrus/integration_test.sh
@@ -45,7 +45,7 @@ case "$SPECIALMODE" in
     bindings)
 	    make
         make install PREFIX=/usr ETCDIR=/etc
-	    cd pkg/bindings/test && ginkgo -r
+	    cd pkg/bindings/test && ginkgo -trace -noColor -debug  -r
 	;;
     none)
         make
diff --git a/contrib/cirrus/logcollector.sh b/contrib/cirrus/logcollector.sh
index 34b88e6ea..e0190971e 100755
--- a/contrib/cirrus/logcollector.sh
+++ b/contrib/cirrus/logcollector.sh
@@ -32,7 +32,7 @@ case $1 in
     df) showrun df -lhTx tmpfs ;;
     ginkgo) showrun cat $CIRRUS_WORKING_DIR/test/e2e/ginkgo-node-*.log ;;
     journal) showrun journalctl -b ;;
-    podman) showrun podman system info ;;
+    podman) showrun ./bin/podman system info ;;
     varlink)
        if [[ "$TEST_REMOTE_CLIENT" == "true" ]]
        then
diff --git a/contrib/cirrus/logformatter b/contrib/cirrus/logformatter
index 4cc4480f5..6a86f6a49 100755
--- a/contrib/cirrus/logformatter
+++ b/contrib/cirrus/logformatter
@@ -52,7 +52,7 @@ a.codelink:hover   { background: #000; color: #999; }
 a.timing           { text-decoration: none; }
 
 /* BATS styles */
-.bats-ok        { color: #3f3; }
+.bats-ok        { color: #393; }
 .bats-notok     { color: #F00; font-weight: bold; }
 .bats-skip      { color: #F90; }
 .bats-log       { color: #900; }
@@ -286,7 +286,8 @@ END_HTML
             $previous_timestamp = '';
             next LINE;
         }
-        elsif ($line =~ /^Running:/) {
+        # (bindings test sometimes emits 'Running' with leading bullet char)
+        elsif ($line =~ /^•?Running:/) {
             # Highlight the important (non-boilerplate) podman command.
             # Strip out the global podman options, but show them on hover
             $line =~ s{(\S+\/podman)((\s+--(root|runroot|runtime|tmpdir|storage-opt|conmon|cgroup-manager|cni-config-dir|storage-driver|events-backend) \S+)*)(.*)}{
@@ -310,6 +311,9 @@ END_HTML
         elsif ($line =~ /^Error:/ || $line =~ / level=(warning|error) /) {
             $line = "<span class='log-warn'>" . $line . "</span>";
         }
+        elsif ($line =~ /^panic:/) {
+            $line = "<span class='log-error'>" . $line . "</span>";
+        }
         else {
             $current_output .= ' ' . $line;
         }
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index 5001ef4dd..9b4a56acd 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -47,6 +47,15 @@ case "${OS_RELEASE_ID}" in
         fi
         ;;
     fedora)
+	# This is temporary and should be removed once conmon is in stable
+	# and the images can be rebuilt properly.
+	if [[ "$OS_RELEASE_VER" -eq "30" ]]; then
+		dnf -y install https://kojipkgs.fedoraproject.org//packages/conmon/2.0.13/1.fc30/x86_64/conmon-2.0.13-1.fc30.x86_64.rpm
+	else
+		dnf -y install https://kojipkgs.fedoraproject.org//packages/conmon/2.0.13/1.fc31/x86_64/conmon-2.0.13-1.fc31.x86_64.rpm
+	fi
+	# End of temporary patch
+
         # All SELinux distros need this for systemd-in-a-container
         setsebool container_manage_cgroup true
         if [[ "$ADD_SECOND_PARTITION" == "true" ]]; then
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 0222be7ba..817be31b7 100644
--- a/contrib/spec/podman.spec.in
+++ b/contrib/spec/podman.spec.in
@@ -48,7 +48,7 @@ Epoch: 99
 %else
 Epoch: 0
 %endif
-Version: 1.8.2
+Version: 1.8.3
 Release: #COMMITDATE#.git%{shortcommit0}%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0
@@ -524,6 +524,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_unitdir}/io.podman.socket
 %{_usr}/lib/systemd/user/io.podman.service
 %{_usr}/lib/systemd/user/io.podman.socket
+%{_unitdir}/podman.service
+%{_unitdir}/podman.socket
+%{_usr}/lib/systemd/user/podman.service
+%{_usr}/lib/systemd/user/podman.socket
 %{_usr}/lib/tmpfiles.d/%{name}.conf
 
 %if 0%{?with_devel}
diff --git a/contrib/systemd/auto-update/podman-auto-update.service b/contrib/systemd/auto-update/podman-auto-update.service
new file mode 100644
index 000000000..b63f24230
--- /dev/null
+++ b/contrib/systemd/auto-update/podman-auto-update.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Podman auto-update service
+Documentation=man:podman-auto-update(1)
+Wants=network.target
+After=network-online.target
+
+[Service]
+ExecStart=/usr/bin/podman auto-update
+
+[Install]
+WantedBy=multi-user.target default.target
diff --git a/contrib/systemd/auto-update/podman-auto-update.timer b/contrib/systemd/auto-update/podman-auto-update.timer
new file mode 100644
index 000000000..3e50ffa9b
--- /dev/null
+++ b/contrib/systemd/auto-update/podman-auto-update.timer
@@ -0,0 +1,9 @@
+[Unit]
+Description=Podman auto-update timer
+
+[Timer]
+OnCalendar=daily
+Persistent=true
+
+[Install]
+WantedBy=timers.target