Merge pull request #43838 from thaJeztah/remove_journald_compat

logger/journald: remove journald_compat (for systemd < 209)

daemon/logger/journald/read_native.go

@@ -1,5 +1,5 @@
-//go:build linux && cgo && !static_build && journald && !journald_compat
-// +build linux,cgo,!static_build,journald,!journald_compat
+//go:build linux && cgo && !static_build && journald
+// +build linux,cgo,!static_build,journald
 
 package journald // import "github.com/docker/docker/daemon/logger/journald"
 

daemon/logger/journald/read_native_compat.go

@@ -1,7 +0,0 @@
-//go:build linux && cgo && !static_build && journald && journald_compat
-// +build linux,cgo,!static_build,journald,journald_compat
-
-package journald // import "github.com/docker/docker/daemon/logger/journald"
-
-// #cgo pkg-config: libsystemd-journal
-import "C"

hack/make.sh

@@ -83,10 +83,8 @@ add_buildtag() {
 	[[ " $DOCKER_BUILDTAGS" == *" $1_"* ]] || DOCKER_BUILDTAGS+=" $1_$2"
 }
 
-if ${PKG_CONFIG} 'libsystemd >= 209' 2> /dev/null; then
+if ${PKG_CONFIG} 'libsystemd' 2> /dev/null; then
 	DOCKER_BUILDTAGS+=" journald"
-elif ${PKG_CONFIG} 'libsystemd-journal' 2> /dev/null; then
-	DOCKER_BUILDTAGS+=" journald journald_compat"
 fi
 
 # test whether "libdevmapper.h" is new enough to support deferred remove

hack/validate/golangci-lint

@@ -11,10 +11,8 @@ SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 [ -n "${TESTDEBUG}" ] && set -x
 
 # TODO find a way to share this code with hack/make.sh
-if ${PKG_CONFIG} 'libsystemd >= 209' 2> /dev/null; then
+if pkg-config 'libsystemd' 2> /dev/null; then
 	DOCKER_BUILDTAGS+=" journald"
-elif ${PKG_CONFIG} 'libsystemd-journal' 2> /dev/null; then
-	DOCKER_BUILDTAGS+=" journald journald_compat"
 fi
 
 echo -e "\n\033[0;36mINFO\033[0m Start validation with golang-ci-lint"