diff --git a/daemon/logger/journald/read_native.go b/daemon/logger/journald/read_native.go index ce1de3fbde..862d064277 100644 --- a/daemon/logger/journald/read_native.go +++ b/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" diff --git a/daemon/logger/journald/read_native_compat.go b/daemon/logger/journald/read_native_compat.go deleted file mode 100644 index 9876591131..0000000000 --- a/daemon/logger/journald/read_native_compat.go +++ /dev/null @@ -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" diff --git a/hack/make.sh b/hack/make.sh index 427def3aca..f0b2720439 100755 --- a/hack/make.sh +++ b/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 diff --git a/hack/validate/golangci-lint b/hack/validate/golangci-lint index fd14690ae1..ab01dcb026 100755 --- a/hack/validate/golangci-lint +++ b/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"