kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #43838 from thaJeztah/remove_journald_compat

Browse source 
logger/journald: remove journald_compat (for systemd < 209)
This commit is contained in:
Sebastiaan van Stijn 2022-07-25 11:25:52 +02:00 committed by GitHub
commit 98d8343aa2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
daemon/logger/journald/read_native.go
View file

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

7
daemon/logger/journald/read_native_compat.go
View file

@ -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"

4
hack/make.sh
View file

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

4
hack/validate/golangci-lint
View file

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