Switch default logdriver and eventslogger to journald, if root

Signed-off-by: Daniel J Walsh <[email protected]>

Makefile

@@ -6,7 +6,7 @@ GO_BUILD=$(GO) build
 ifeq ($(shell go help mod >/dev/null 2>&1 && echo true), true)
 	GO_BUILD=GO111MODULE=on $(GO) build -mod=vendor
 endif
-BUILDTAGS := containers_image_openpgp,systemd
+BUILDTAGS := containers_image_openpgp,systemd,exclude_graphdriver_devicemapper
 DESTDIR ?=
 PREFIX := /usr/local
 CONFIGDIR := ${PREFIX}/share/containers
@@ -35,8 +35,17 @@ define go-build
 	GOOS=$(1) GOARCH=$(2) $(GO) build -tags "$(3)" ./...
 endef
 
+define go-build-c
+	CGO_ENABLED=1 \
+	GOOS=$(1) GOARCH=$(2) $(GO) build -tags "$(3)" ./...
+endef
+
 .PHONY:
 build-cross:
+	$(call go-build-c,linux) # attempt to build without tags
+	$(call go-build-c,linux,,${BUILDTAGS})
+	$(call go-build-c,linux,386,${BUILDTAGS})
+	$(call go-build,linux) # attempt to build without tags
 	$(call go-build,linux,386,${BUILDTAGS})
 	$(call go-build,linux,arm,${BUILDTAGS})
 	$(call go-build,linux,arm64,${BUILDTAGS})

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/containers/image/v5 v5.13.2
 	github.com/containers/ocicrypt v1.1.2
 	github.com/containers/storage v1.32.5
+	github.com/coreos/go-systemd/v22 v22.3.2
 	github.com/disiqueira/gotree/v3 v3.0.2
 	github.com/docker/distribution v2.7.1+incompatible
 	github.com/docker/docker v20.10.7+incompatible

pkg/config/default.go

@@ -105,8 +105,6 @@ const (
 	DefaultApparmorProfile = apparmor.Profile
 	// SystemdCgroupsManager represents systemd native cgroup manager
 	SystemdCgroupsManager = "systemd"
-	// DefaultLogDriver is the default type of log files
-	DefaultLogDriver = "k8s-file"
 	// DefaultLogSizeMax is the default value for the maximum log size
 	// allowed for a container. Negative values mean that no limit is imposed.
 	DefaultLogSizeMax = -1

pkg/config/nosystemd.go

@@ -1,7 +1,12 @@
-// +build !systemd
+// +build !systemd !cgo
 
 package config
 
+const (
+	// DefaultLogDriver is the default type of log files
+	DefaultLogDriver = "k8s-file"
+)
+
 func defaultCgroupManager() string {
 	return CgroupfsCgroupsManager
 }

pkg/config/systemd.go

@@ -1,4 +1,4 @@
-// +build systemd
+// +build systemd,cgo
 
 package config
 
@@ -9,11 +9,19 @@ import (
 
 	"github.com/containers/common/pkg/cgroupv2"
 	"github.com/containers/storage/pkg/unshare"
+	"github.com/coreos/go-systemd/v22/sdjournal"
 )
 
 var (
-	systemdOnce sync.Once
-	usesSystemd bool
+	systemdOnce  sync.Once
+	usesSystemd  bool
+	journaldOnce sync.Once
+	usesJournald bool
+)
+
+const (
+	// DefaultLogDriver is the default type of log files
+	DefaultLogDriver = "journald"
 )
 
 func defaultCgroupManager() string {
@@ -29,20 +37,17 @@ func defaultCgroupManager() string {
 }
 
 func defaultEventsLogger() string {
-	if useSystemd() {
+	if useJournald() {
 		return "journald"
 	}
 	return "file"
 }
 
 func defaultLogDriver() string {
-	// If we decide to change the default for logdriver, it should be done here.
-	if useSystemd() {
-		return DefaultLogDriver
+	if useJournald() {
+		return "journald"
 	}
-
-	return DefaultLogDriver
-
+	return "k8s-file"
 }
 
 func useSystemd() bool {
@@ -56,3 +61,19 @@ func useSystemd() bool {
 	})
 	return usesSystemd
 }
+
+func useJournald() bool {
+	journaldOnce.Do(func() {
+		if !useSystemd() {
+			return
+		}
+		journal, err := sdjournal.NewJournal()
+		if err != nil {
+			return
+		}
+		journal.Close()
+		usesJournald = true
+		return
+	})
+	return usesJournald
+}