Commit Graph

133 Commits

Author SHA1 Message Date
3274cd15bf Change the btrfs_noversion check to be automatic
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 3761955e8c1e7534026c469186c3f66c18e77cbc
Component: engine
2015-04-03 01:30:12 -06:00
e69b047ff4 Enable bash completion in build environment
Installs and configures bash completion for Docker.
Note that bash completion still has to be initialized by a custom
.bashrc file.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: e8edcf47b4b495070a3a3db7b2faeef91adf83f9
Component: engine
2015-03-29 06:50:46 -07:00
b16d50a307 Correctly close pipe after error in tarsum verification
This addresses a subtle deadlock where an error during a copy prevented pipe
closure to propagate correctly. By closing down the read end of the pipe rather
than the write end, the waiting writer is properly signaled. A nice side-effect
of this change is that errors encountered by io.Copy are now propagated to the
verifier's Write method.

A test to ensure validation errors for unsupported digest types has been added,
as well.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 0306a41909175b467d08ebc97d4c5136ca9e7ebd
Component: engine
2015-03-18 19:07:55 -07:00
3105d32a23 Support push and pull of sha256
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 514be385f7451df8bbf9e1a7bb015e3baec406f1
Component: engine
2015-03-17 10:50:35 -07:00
d6d379e87a Add ability to refer to image by name + digest
Add ability to refer to an image by repository name and digest using the
format repository@digest. Works for pull, push, run, build, and rmi.

Signed-off-by: Andy Goldstein <agoldste@redhat.com>
Upstream-commit: a2b0c9778feac970524b98ef7a91b5528fdeb9d5
Component: engine
2015-03-17 10:10:42 +00:00
f32b25fee3 Fix test pull verified
Update pull code to consider any layer download or new tag as an update.
Update hello-world frozen image to be explicitly tagged as frozen, to not interfere with pull tests.  The hello-world is used by pull tests because of its small size and there is no other official image with such a size.

fixes #11383

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 636037c3637eb1d09cc469cebe39ffb915bb0aa9
Component: engine
2015-03-16 12:22:00 -07:00
2c409e6dd8 Fix builder when num of RUN args is 1
FROM scratch
ADD echo /
RUN [ "echo" ]

will die with
  exec: "/bin/sh": stat /bin/sh: no such file or directory

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 645f8a32df3b5b22e5e194664a9f0733709714c9
Component: engine
2015-03-11 07:30:44 -07:00
c071c815d3 Refactor busybox downloading as generic "frozen-images"
This makes it much simpler to add new "frozen" images -- simply add them to the `Dockerfile` and in `hack/make/.ensure-frozen-images` and you're off to the races.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 09b4c2585284d1125d4d299a7d58b36c1d0baf17
Component: engine
2015-03-09 19:02:59 -06:00
66c985e514 Download busybox from the Hub instead of GitHub
This downloads a specific image ID of `busybox:latest` from the Hub directly (within the `Dockerfile`, ready for `docker load`) instead of grabbing the source from GitHub and doing a `docker build` at daemon start time.  This ensures the test suite runs more consistently.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 351074edcd22e4ca587713feda541268a66cdb86
Component: engine
2015-03-02 14:38:19 -07:00
0a09f8ffe0 Add support for an optional ".bashrc" file
If `.bashrc` exists at the root of the source tree, it will be used as the `~/.bashrc` inside the container.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: c62230a879e0461c43a4fc7d2e2e2efdd466fedd
Component: engine
2015-03-02 10:33:26 -07:00
2b1fd26fbf Prefix / to the container name is ignored when container is renamed
Closes #10996

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: caaae78247d9ceecba07da381401c2376b478c2b
Component: engine
2015-02-27 22:40:04 +00:00
7b25cb1708 Merge pull request #10872 from jfrazelle/ugh-tomlv
fix tomlv because it doesn't read from stdin
Upstream-commit: a78ce5c228b895d8c614d72354a52e324817b9fc
Component: engine
2015-02-19 20:31:34 -08:00
dd3dafec23 fix tomlv because it doesn't read from stdin
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 06685a53c16468a5fd3dfcc247a7a8dd5aaf85c1
Component: engine
2015-02-19 13:18:20 -08:00
0846fa52ae Merge pull request #10797 from tianon/strict-test-environment
Upstream-commit: d562f94d473a07c3bee84e66dd9cbf60c04ea7fe
Component: engine
2015-02-19 16:14:05 -05:00
26c37e453e Remove cirros.tar.gz completely
Since `cirros.tar.gz` only existed to test `docker import`'s display and
presence in `docker events`, we can instead just use `docker export`
piped directly to `docker import` to achieve the same goal without
another external dependency besides `busybox` (which we already have).

While I was at it, I updated `TestImportDisplay` to also test that the
imported image actually runs successfully as well (so we're testing the
full import round-trip).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: c7bec92891180ccffd1536839ba3bcc85d9c96a4
Component: engine
2015-02-18 23:46:25 -07:00
f303319a62 Run tests in stricter environment
Use `env -i` to very explicitly control exactly which environment variables leak into our tests.  This enforces a clean separation of "build environment knobs" versus "test suite knobs".

This also includes a minor tweak to how we handle starting our integration daemon, especially to catch failure to start sooner than failing tests.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: ed345fb18ee9d003f30884b696628b75380a426a
Component: engine
2015-02-18 23:30:43 -07:00
fd73e8b011 Dockerfile: bump Go to 1.4.2
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 2f35f60348663b3775f038eadea4fccbd0591725
Component: engine
2015-02-18 15:07:17 +02:00
47f750ae10 Revert "Remove windows from the list of supported platforms"
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 4bc4587f05a754f52e40928c32c84ea48cc3522f
Component: engine
2015-02-09 15:22:22 -07:00
255fb9b1d6 Validate toml
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
Upstream-commit: d245a8a706558c4a66498cb8d1a1d8fe38dd67ee
Component: engine
2015-01-30 15:22:11 -08:00
dd5b8c65d4 Update go-md2man
Update fixes some rendering issues, including improperly escaping '$' in
blocks, and actual parsing of blockcode.

`ID=$(sudo docker run -d fedora /usr/bin/top -b)` was being converted to
`ID=do docker run -d fedora/usr/bin/top -b)`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 79e8ca04f5764c150b61b1b05785fb3926613fa1
Component: engine
2015-01-27 09:33:42 -05:00
44958a29f2 Remove windows from the list of supported platforms
Since it can still be tested natively without this, this won't cause any harm while we fix the tests to actually work on Windows.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 47769994e5cba81a96529b418052afce7a6d51a3
Component: engine
2015-01-22 15:42:17 -07:00
7d2e2990e3 Update Dockerfile to use Godeps for distribution
Update our "registry" install to use the included Godeps libraries so that it
doesn't require anything from our current source (hence moving it up for
better caching too)

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 681f4d84ae05a98b7096d52a168222bae362d9e1
Component: engine
2015-01-20 19:52:08 -08:00
a90195f1c8 Resolve ambiguity on registry v2 ping
v2 ping now checks for a Docker-Distribution-API-Version
header that identifies the endpoint as "registry/2.0"

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: f46923be8eba81dd9e261554128b26a1c83ce398
Component: engine
2015-01-20 19:52:08 -08:00
243df800ea Merge pull request #10155 from tianon/netgo-take-three
Let's try fixing "netgo" again
Upstream-commit: b2fe1b3dd952daaadccf9951c269af84030e8873
Component: engine
2015-01-20 09:45:42 -08:00
1e4478b6cf Let's try fixing "netgo" again
Since "go test" doesn't seem to support "-installsuffix" as quite the same perfect solution that "go build" is happy to let it be, let's just switch those crappy old "integration/" tests to use our separate static dockerinit binary so we don't have to worry about compiling the entire test harness statically. 👍

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 232d59baeb13778abc242a602ca434d83e1eb6e8
Component: engine
2015-01-19 12:48:25 -07:00
b098aaedce Merge pull request #9784 from dmcgowan/v2-registry
Client Support for Docker Registry HTTP API V2
Upstream-commit: 8b95ad230e2ee76450ceb9a80aa8e942a56bb397
Component: engine
2015-01-19 10:46:38 -08:00
f41baa0c49 bump go to 1.4.1
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 933f957e773d5b9da13e32649d0f987b30e87eb5
Component: engine
2015-01-16 09:45:37 +02:00
429cac7027 Install registry V2 in image
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: ef96c28754706da921644e5cf9202f9cc78d4c7e
Component: engine
2015-01-15 14:05:06 -08:00
fcb3e5c2df Revert "Add proper "netgo" compiling, thanks to rsc ♥"
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jfrazelle@users.noreply.github.com> (github: jfrazelle)
Upstream-commit: e7cfb1c28b2a52f34c8e48ede2e24645991d1104
Component: engine
2015-01-14 09:55:35 -08:00
162b61e657 Add proper "netgo" compiling, thanks to rsc ♥
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: b5aba426d4bb903825ec4b3b4912f521daac4c2a
Component: engine
2015-01-13 21:35:21 -07:00
e622152215 Switch docker-py clone to use an explicit commit for natural cache-busting
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 3c01c971cdec8822086d03f509e119cb8a8c719c
Component: engine
2015-01-13 12:34:55 -07:00
1ea6d14644 Bumped docker-py version to latest release
Signed-off-by: Joffrey F <joffrey@docker.com>
Upstream-commit: 3873b19c31a882a3240fc04b63e23e8a557028c0
Component: engine
2015-01-12 15:01:09 -08:00
5689fc7e46 Add apparmor
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: cdc14c7cbf3ad912588e8cc51f798183f369c9cc
Component: engine
2015-01-09 18:22:19 -08:00
a1663344f6 Add "gofmt" from Go 1.3.3
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: b20363c4c056bebe256f0d53283ca1e537ed5cf6
Component: engine
2015-01-09 09:54:58 -07:00
1f9824720a Refactor Dockerfile version number usage
This refactors version number usage for several of our "download/install this exact version" bits so we have an easier time replacing the version numbers in Jenkins.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 2677f1add48961115f08016da422d74cafbf4c8b
Component: engine
2015-01-09 09:53:39 -07:00
deb2f04620 Install lxc from source.
Haters gunna hate, cache bust. But this fixes a bunch of tests.

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: e3b3719f16cbae506d15474c122276e21f59d3a5
Component: engine
2015-01-08 11:37:48 -08:00
ea57886ce2 Adjust Dockerfile style to be more consistent
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 179e9deb1abcd1aa8e536aa314f46ea403fb89ba
Component: engine
2014-12-24 00:26:19 -07:00
50a73ae598 Reinstall standard library with netgo
Fixes #9449

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 6ac802ecd8e097f49c4b026fd7b5febfc683866c
Component: engine
2014-12-21 13:49:45 +02:00
88e70a98ec bump Go to 1.4
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 62e8a93c3496791e8bfb2204f68b2a1cdf61fec9
Component: engine
2014-12-21 13:49:45 +02:00
241c2f0465 Tweak test-docker-py feature
- move docker/docker-py clone to the Dockerfile
- put "integration test daemon startup" code in a separate file for both scripts to source
- add new test-docker-py Makefile target
- include "python-websocket" package in Dockerfile for running the tests

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 100267de81985bbf3b976bfde850def89487dc11
Component: engine
2014-12-19 10:47:01 -07:00
da3465e509 Add docker-py integration tests aginst the docker daemon
This clones and run the integration tests for docker-py master as part
of the integration tests created on master.  docker-py hits the api
directly and should be a good way to identify regressions in the api.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 5d6eca6642c5749099513f1f66bb44e004aa0938
Component: engine
2014-12-17 13:48:45 -08:00
db3cf4f54c Add windows back.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 54229fad933c91f5d890e14be389651e98f62e02
Component: engine
2014-12-12 13:44:41 -08:00
bc16e560f9 Windows should not be officially released.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 750dc335a983fcd2c1410bffe5e23d1b0b3c3e3c
Component: engine
2014-11-26 11:50:07 -08:00
35f4af009d Add windows/(386,amd64) to cross platforms list
Edited make scripts to append .exe to windows binary

Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
Upstream-commit: b7703a992e14255a5972bf157d0c2cfc0da3d53f
Component: engine
2014-11-14 18:20:54 -08:00
45609ac359 Merge pull request #9165 from hansrodtang/master
Updated cover tool import path.
Upstream-commit: 8bb6957d3bd6fb1d201702330418595ad4b0a1e2
Component: engine
2014-11-14 14:10:20 -07:00
69df5cc039 Updated cover tool import path.
Signed-off-by: Hans Rødtang <hansrodtang@gmail.com>
Upstream-commit: b4336803f35591c8e4d94b023c9d5e9525795520
Component: engine
2014-11-14 06:16:41 +01:00
5dc5f5a90b Dockerfile: buildtags for old btrfs
Since the build uses ubuntu 14.04, which has an old btrfs, include the
buildtags needed for this old version to not break the build.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: d7c37b5a28de6e7c0a9270815c092a45d8d7fef7
Component: engine
2014-11-13 16:44:00 -05:00
537f6ff11c bump fpm to 1.3.2
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 03f67aa46a07024a98dd9677a3b3e73ea5da80c3
Component: engine
2014-11-05 10:12:57 +02:00
c1f75e87da DOCKER_VERSION and docker-version havn't been implemented.
So far, it looks like the declarations are not used, and so its safer not to
confuse people into thinking they do something.

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 6ed610fb8014d500e001bb0677f0e1af0dc9312d
Component: engine
2014-10-21 16:04:11 +10:00
e0af0724d0 Write s3cfg to $HOME
Because of the base image change, $HOME is not always / and we need to
write to the proper $HOME within the container to complete the release
process.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: e0a1df8e683879bb999623a9521b272aafcc4208
Component: engine
2014-10-14 03:34:24 +00:00