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

fix logic because jess is the worst

Browse source 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <acidburn@docker.com>
This commit is contained in:
Jessica Frazelle 2015-10-09 19:09:02 -07:00 • committed by Phil Estes
parent a85e6a4d4a
commit 930b27a86b
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
hack/make.sh
View file

@ -220,6 +220,7 @@ test_env() {
DOCKER_GRAPHDRIVER="$DOCKER_GRAPHDRIVER" \ DOCKER_GRAPHDRIVER="$DOCKER_GRAPHDRIVER" \
DOCKER_USERLANDPROXY="$DOCKER_USERLANDPROXY" \ DOCKER_USERLANDPROXY="$DOCKER_USERLANDPROXY" \
DOCKER_HOST="$DOCKER_HOST" \ DOCKER_HOST="$DOCKER_HOST" \
DOCKER_REMAP_ROOT="$DOCKER_REMAP_ROOT" \
DOCKER_REMOTE_DAEMON="$DOCKER_REMOTE_DAEMON" \ DOCKER_REMOTE_DAEMON="$DOCKER_REMOTE_DAEMON" \
GOPATH="$GOPATH" \ GOPATH="$GOPATH" \
HOME="$ABS_DEST/fake-HOME" \ HOME="$ABS_DEST/fake-HOME" \

4
integration-cli/requirements.go
View file

@ -152,9 +152,9 @@ var (
func() bool { func() bool {
root := os.Getenv("DOCKER_REMAP_ROOT") root := os.Getenv("DOCKER_REMAP_ROOT")
if root != "" { if root != "" {
return true return false
} }
return false return true
}, },
"Test cannot be run when remapping root", "Test cannot be run when remapping root",
} }