diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-10 19:31:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-10 19:31:14 +0100 |
| commit | a83a94b095b298c1e8cbcaf20f0744a5807df1de (patch) | |
| tree | 132e6491ef4e15caa7d7296d2492dbc1f2cb41d8 /libpod | |
| parent | 173f430852e52a1acf69b4d9d18da20893031a79 (diff) | |
| parent | 450361fc640751c2a33210a02ceff0874c9f449b (diff) | |
| download | podman-a83a94b095b298c1e8cbcaf20f0744a5807df1de.tar.gz podman-a83a94b095b298c1e8cbcaf20f0744a5807df1de.tar.bz2 podman-a83a94b095b298c1e8cbcaf20f0744a5807df1de.zip | |
Merge pull request #5448 from vrothberg/update-systemd
update systemd & dbus dependencies
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container_log_linux.go | 2 | ||||
| -rw-r--r-- | libpod/events/journal_linux.go | 4 | ||||
| -rw-r--r-- | libpod/healthcheck_linux.go | 4 | ||||
| -rw-r--r-- | libpod/oci_conmon_linux.go | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/libpod/container_log_linux.go b/libpod/container_log_linux.go index 748715ed3..03010d8ed 100644 --- a/libpod/container_log_linux.go +++ b/libpod/container_log_linux.go @@ -11,7 +11,7 @@ import ( "time" "github.com/containers/libpod/libpod/logs" - journal "github.com/coreos/go-systemd/sdjournal" + journal "github.com/coreos/go-systemd/v22/sdjournal" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/libpod/events/journal_linux.go b/libpod/events/journal_linux.go index 9e6fffc29..482435038 100644 --- a/libpod/events/journal_linux.go +++ b/libpod/events/journal_linux.go @@ -7,8 +7,8 @@ import ( "strconv" "time" - "github.com/coreos/go-systemd/journal" - "github.com/coreos/go-systemd/sdjournal" + "github.com/coreos/go-systemd/v22/journal" + "github.com/coreos/go-systemd/v22/sdjournal" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/libpod/healthcheck_linux.go b/libpod/healthcheck_linux.go index dca72430d..5da2d311b 100644 --- a/libpod/healthcheck_linux.go +++ b/libpod/healthcheck_linux.go @@ -9,8 +9,8 @@ import ( "strings" "github.com/containers/libpod/pkg/rootless" - "github.com/coreos/go-systemd/dbus" - godbus "github.com/godbus/dbus" + "github.com/coreos/go-systemd/v22/dbus" + godbus "github.com/godbus/dbus/v5" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index 800f89603..a5530e448 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -30,7 +30,7 @@ import ( "github.com/containers/libpod/pkg/util" "github.com/containers/libpod/utils" pmount "github.com/containers/storage/pkg/mount" - "github.com/coreos/go-systemd/activation" + "github.com/coreos/go-systemd/v22/activation" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux" "github.com/opencontainers/selinux/go-selinux/label" |