Skip to content

Bump libcontainer dep#7312

Merged
crosbymichael merged 4 commits intomoby:masterfrom
tianon:update-libcontainer
Jul 31, 2014
Merged

Bump libcontainer dep#7312
crosbymichael merged 4 commits intomoby:masterfrom
tianon:update-libcontainer

Conversation

@tianon
Copy link
Copy Markdown
Member

@tianon tianon commented Jul 29, 2014

This also includes the HOME changes, so I've updated the relevant tests.

Fixes #2968

@crosbymichael
Copy link
Copy Markdown
Contributor

Getting an error:

--- FAIL: TestEnvironment (0.49 seconds)
        docker_cli_run_test.go:693: Wrong environment variable: should be HOME=/root, not HOME=/

@tianon
Copy link
Copy Markdown
Member Author

tianon commented Jul 29, 2014

Arg, thanks; I'll dig into it.

@tianon
Copy link
Copy Markdown
Member Author

tianon commented Jul 29, 2014

Hmm, it works fine here:

$ make TESTFLAGS='-run TestEnvironment' test-integration-cli
docker build -t "docker:update-libcontainer" .
Sending build context to Docker daemon 78.52 MB
Sending build context to Docker daemon 
Step 0 : docker-version 0.6.1
# Skipping unknown instruction DOCKER-VERSION
Step 1 : FROM ubuntu:14.04
 ---> ba5877dc9bec
Step 2 : MAINTAINER Tianon Gravi <admwiggin@gmail.com> (@tianon)
 ---> Using cache
 ---> 94a85e3c9e24
Step 3 : RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq  apt-utils  aufs-tools  automake  btrfs-tools  build-essential  curl  dpkg-sig  git  iptables  libapparmor-dev  libcap-dev  libsqlite3-dev  lxc=1.0*  mercurial  pandoc  parallel  reprepro  ruby1.9.1  ruby1.9.1-dev  s3cmd=1.1.0*  --no-install-recommends
 ---> Using cache
 ---> 6eac61eef5e8
Step 4 : RUN git clone --no-checkout https://git.fedorahosted.org/git/lvm2.git /usr/local/lvm2 && cd /usr/local/lvm2 && git checkout -q v2_02_103
 ---> Using cache
 ---> 8f7ddf656757
Step 5 : RUN cd /usr/local/lvm2 && ./configure --enable-static_link && make device-mapper && make install_device-mapper
 ---> Using cache
 ---> 411c105c5ed6
Step 6 : RUN curl -sSL https://golang.org/dl/go1.3.src.tar.gz | tar -v -C /usr/local -xz
 ---> Using cache
 ---> d76258434c37
Step 7 : ENV PATH /usr/local/go/bin:$PATH
 ---> Using cache
 ---> ccd19be55633
Step 8 : ENV GOPATH /go:/go/src/github.com/docker/docker/vendor
 ---> Using cache
 ---> 127ba909b578
Step 9 : RUN cd /usr/local/go/src && ./make.bash --no-clean 2>&1
 ---> Using cache
 ---> c73420fa202a
Step 10 : ENV DOCKER_CROSSPLATFORMS  linux/386 linux/arm  darwin/amd64 darwin/386  freebsd/amd64 freebsd/386 freebsd/arm
 ---> Using cache
 ---> cfc365a22b5e
Step 11 : ENV GOARM 5
 ---> Using cache
 ---> d2ad119af959
Step 12 : RUN cd /usr/local/go/src && bash -xc 'for platform in $DOCKER_CROSSPLATFORMS; do GOOS=${platform%/*} GOARCH=${platform##*/} ./make.bash --no-clean 2>&1; done'
 ---> Using cache
 ---> f0be12faa0f2
Step 13 : RUN go get code.google.com/p/go.tools/cmd/cover
 ---> Using cache
 ---> 880c9974fd6c
Step 14 : RUN gem install --no-rdoc --no-ri fpm --version 1.0.2
 ---> Using cache
 ---> f621bd054e0c
Step 15 : RUN git clone -b buildroot-2014.02 https://github.com/jpetazzo/docker-busybox.git /docker-busybox
 ---> Using cache
 ---> 6d2b3ef82b3d
Step 16 : RUN /bin/echo -e '[default]\naccess_key=$AWS_ACCESS_KEY\nsecret_key=$AWS_SECRET_KEY' > /.s3cfg
 ---> Using cache
 ---> 002e3a15af94
Step 17 : RUN git config --global user.email 'docker-dummy@example.com'
 ---> Using cache
 ---> 4b98025224c8
Step 18 : RUN groupadd -r docker
 ---> Using cache
 ---> 5670bc99c707
Step 19 : RUN useradd --create-home --gid docker unprivilegeduser
 ---> Using cache
 ---> 6c4d350d7777
Step 20 : VOLUME /var/lib/docker
 ---> Using cache
 ---> 35a653553b31
Step 21 : WORKDIR /go/src/github.com/docker/docker
 ---> Using cache
 ---> d85f9efc6eca
Step 22 : ENV DOCKER_BUILDTAGS apparmor selinux
 ---> Using cache
 ---> a474426789ff
Step 23 : ENTRYPOINT ["hack/dind"]
 ---> Using cache
 ---> d0c9a71180d4
Step 24 : COPY . /go/src/github.com/docker/docker
 ---> Using cache
 ---> e677d17ccb49
Successfully built e677d17ccb49
docker run --rm -it --privileged -e TESTFLAGS -e TESTDIRS -e DOCKER_GRAPHDRIVER -e DOCKER_EXECDRIVER -v "/home/tianon/downloads/docker/bundles:/go/src/github.com/docker/docker/bundles" "docker:update-libcontainer" hack/make.sh binary test-integration-cli

bundles/1.1.2-dev already exists. Removing.

---> Making bundle: binary (in bundles/1.1.2-dev/binary)
Created binary: /go/src/github.com/docker/docker/bundles/1.1.2-dev/binary/docker-1.1.2-dev

---> Making bundle: test-integration-cli (in bundles/1.1.2-dev/test-integration-cli)
++ exec docker --daemon --debug --storage-driver vfs --exec-driver native --pidfile /go/src/github.com/docker/docker/bundles/1.1.2-dev/test-integration-cli/docker.pid
++++ tar -cf /docker-scratch.tar -C /docker-scratch .
++++ docker load --input /docker-scratch.tar
+++ docker build -t busybox /docker-busybox
Sending build context to Docker daemon 20.31 MB
Sending build context to Docker daemon 
Step 0 : FROM scratch
 ---> 511136ea3c5a
Step 1 : MAINTAINER Jérôme Petazzoni <jerome@docker.com>
 ---> Running in c6078cdebb25
 ---> a3d922d9573d
Removing intermediate container c6078cdebb25
Step 2 : ADD rootfs.tar /
 ---> d482310bffa1
Removing intermediate container c05e479d79a0
Step 3 : CMD ["/bin/sh"]
 ---> Running in 7c8b7fa3bbf2
 ---> 9fc1c18718d1
Removing intermediate container 7c8b7fa3bbf2
Successfully built 9fc1c18718d1
+ go test -run TestEnvironment github.com/docker/docker/integration-cli
[PASSED]: run - verify environment
PASS
coverage: 15.9% of statements
ok      github.com/docker/docker/integration-cli    0.577s
+++ cat /go/src/github.com/docker/docker/bundles/1.1.2-dev/test-integration-cli/docker.pid
++ kill 631

@crosbymichael
Copy link
Copy Markdown
Contributor

@tianon i consistently get the same failure if I run all the tests together on my F20 3.15.6 box

@vieux
Copy link
Copy Markdown
Contributor

vieux commented Jul 30, 2014

Same error as @crosbymichael

--- FAIL: TestEnvironment (0.18 seconds)
    docker_cli_run_test.go:693: Wrong environment variable: should be HOME=/root, not HOME=/

tough my computer runs the test two times faster 🚕

@tianon
Copy link
Copy Markdown
Member Author

tianon commented Jul 30, 2014

Heh. Are you guys running with a saved "/var/lib/docker" for each run, or otherwise getting a not-fresh busybox image?

@tianon
Copy link
Copy Markdown
Member Author

tianon commented Jul 30, 2014

(because if you run the tests with an old busybox, it'll have HOME=/ hard-coded by the old builder code - we probably need to handle this somehow, at least for the tests)

@tianon
Copy link
Copy Markdown
Member Author

tianon commented Jul 30, 2014

Ok, I've rebased and added a little something extra to force a rebuild of the busybox container if it's got a yucky hard-coded HOME env variable.

@vieux
Copy link
Copy Markdown
Contributor

vieux commented Jul 31, 2014

Same

tianon added 4 commits July 31, 2014 12:46
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
…s autofilled

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
@tianon
Copy link
Copy Markdown
Member Author

tianon commented Jul 31, 2014

Ok @vieux, got a whole new solution in place now that should much work better all-around for everyone - it just explicitly adds -e=HOME= (ie, empty home) so it forces it to look unset and get autofilled properly. ❤️

@crosbymichael
Copy link
Copy Markdown
Contributor

LGTM

1 similar comment
@tiborvass
Copy link
Copy Markdown
Contributor

LGTM

crosbymichael pushed a commit that referenced this pull request Jul 31, 2014
@crosbymichael crosbymichael merged commit b1496ef into moby:master Jul 31, 2014
@tianon tianon deleted the update-libcontainer branch July 31, 2014 22:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Set $HOME in container

4 participants