forked from pool/docker
Accepting request 494283 from home:cyphar:containers
- Add a partial fix for boo#1038493. - Fixed bsc#1037436 where execids were being leaked due to bad error handling. This is a backport of https://github.com/docker/cli/pull/52. + bsc1037436-0001-client-check-tty-before-creating-exec-job.patch OBS-URL: https://build.opensuse.org/request/show/494283 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=184
This commit is contained in:
committed by
Git OBS Bridge
parent
1e1a89ae18
commit
e7663235ed
@@ -54,6 +54,8 @@ Patch200: secrets-0001-daemon-allow-directory-creation-in-run-secrets.patc
|
||||
Patch201: secrets-0002-SUSE-implement-SUSE-container-secrets.patch
|
||||
# PATCH-FIX-UPSTREAM: Backports.
|
||||
Patch300: integration-cli-fix-TestInfoEnsureSucceeds.patch
|
||||
# PATCH-FIX-UPSTREAM: Backport of https://github.com/docker/cli/pull/52 (bsc#1037436).
|
||||
Patch400: bsc1037436-0001-client-check-tty-before-creating-exec-job.patch
|
||||
BuildRequires: audit
|
||||
BuildRequires: bash-completion
|
||||
BuildRequires: ca-certificates
|
||||
@@ -165,6 +167,7 @@ Test package for docker. It contains the source code and the tests.
|
||||
%patch201 -p1
|
||||
%endif
|
||||
%patch300 -p1
|
||||
%patch400 -p1
|
||||
cp %{SOURCE7} .
|
||||
cp %{SOURCE10} .
|
||||
|
||||
@@ -186,6 +189,9 @@ BUILDTAGS="seccomp $BUILDTAGS"
|
||||
export AUTO_GOPATH=1
|
||||
export DOCKER_BUILDTAGS="$BUILDTAGS"
|
||||
export DOCKER_GITCOMMIT=%{git_version}
|
||||
# Until boo#1038493 is fixed properly we need to do this hack to get the
|
||||
# compiled-into-the-binary GOROOT.
|
||||
export GOROOT="$(GOROOT= go env GOROOT)"
|
||||
EOF
|
||||
) > docker_build_env
|
||||
. ./docker_build_env
|
||||
@@ -255,7 +261,7 @@ PKG_LIST=$(go list -e \
|
||||
| grep -v 'github.com/docker/docker/pkg/integration$')
|
||||
%else
|
||||
| grep -v 'github.com/docker/docker/pkg/integration$' \
|
||||
| grep -v 'github.com/docker/docker/profiles/seccomp$')
|
||||
| grep -v 'github.com/docker/docker/profiles/seccomp$')
|
||||
%endif
|
||||
|
||||
go test -cover -ldflags -w -tags "$DOCKER_BUILDTAGS" -a -test.timeout=10m $PKG_LIST
|
||||
|
Reference in New Issue
Block a user