Commit graph

109 commits

Author SHA1 Message Date
Michael Crosby
c553be5a4f Update libcontainer to aa10040b570386c1ae311c6245b
Includes mqueue label fix and cgroups improvements.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-11 11:49:15 -07:00
Michael Crosby
ec7621aab5 Merge pull request #11277 from chenhanxiao/RELEASE-CHECKLIST-typo
RELEASE-CHECKLIST: fix a typo
2015-03-10 10:50:34 -07:00
Tibor Vass
cda003775f Merge pull request #11218 from tianon/refactor-frozen
Refactor busybox downloading as generic "frozen-images"
2015-03-10 11:47:00 -04:00
Jessie Frazelle
2fb89b2e2c Merge pull request #11208 from LK4D4/new_libcontainer_api
New libcontainer api
2015-03-10 07:50:19 -07:00
Chen Hanxiao
8d138eb7fa RELEASE-CHECKLIST: fix a typo
s/cabdidate/candidate
s/can get bring/can bring

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
2015-03-10 05:03:28 -04:00
Tianon Gravi
09b4c25852 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>
2015-03-09 19:02:59 -06:00
Alexander Morozov
7c4951d552 Merge pull request #10893 from ahmetalpbalkan/win-cli/BuildViaDockerfileURL-same-host-fix
integ-cli: Implement remote FakeStorage server for build via URL tests
2015-03-09 13:33:40 -07:00
Ahmet Alp Balkan
2e95bb5f1a integ-cli: Implement remote FakeStorage server for build via URL tests
Implemented a FakeStorage alternative that supports spinning
up a remote container on DOCKER_TEST_HOST to serve files over
an offline-compiled Go static web server image so that tests which
use URLs in Dockerfile can build them over at the daemon side.

`fakeStorage` function now automatically chooses if it should
use a local httptest.Server or a remote container.

This fixes the following tests when running against a remote
daemon:

- `TestBuildCacheADD`
- `TestBuildCopyWildcardNoFind`
- `TestBuildCopyWildcardCache`
- `TestBuildADDRemoteFileWithCache`
- `TestBuildADDRemoteFileWithoutCache`
- `TestBuildADDRemoteFileMTime`
- `TestBuildADDLocalAndRemoteFilesWithCache`
- `TestBuildADDLocalAndRemoteFilesWithoutCache`
- `TestBuildFromURLWithF`
- `TestBuildApiDockerFileRemote`

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-03-09 12:03:55 -07:00
Arnaud Porterie
89bdaa35e0 Remove subdirectories MAINTAINERS files
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-03-06 18:21:51 -08:00
Phil Estes
2aab992e17 Merge pull request #11119 from tianon/busybox-from-hub
Download busybox from the Hub instead of GitHub
2015-03-06 18:01:43 -05:00
Alexander Morozov
7910cb5243 update libcontainer to dd3cb8822352fd4acc0b8b426bd86e47e98f6853
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-06 11:25:55 -08:00
Tianon Gravi
8625a281c6 Rename .dockerversion to .go-autogen so it's clear that all autogenerated code goes here
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-03-03 12:42:38 -07:00
Tianon Gravi
351074edcd 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>
2015-03-02 14:38:19 -07:00
Michael Crosby
a7cacbeb1d Merge pull request #10957 from tianon/cleanup-autogen
Cleanup "autogen/" if we have successful build
2015-02-24 13:25:46 -08:00
Jessica Frazelle
e63a693c6d add tools doc
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
2015-02-24 11:05:05 -08:00
Tianon Gravi
44adbf23b5 Cleanup "autogen/" if we have successful build
This way, we only leave around autogenerated files if the build fails (which is reasonable IMO, since that's when you'd need them for debugging the build failure).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-02-23 14:12:44 -07:00
Jessie Frazelle
83bf0ac96d Merge pull request #10954 from icecrime/update_release_checklist
Update RELEASE-CHECKLIST.md
2015-02-23 12:20:04 -08:00
Tianon Gravi
3562997296 Merge pull request #10951 from tianon/fix-dynbinary
Fix dynbinary with new autogen code
2015-02-23 12:08:17 -08:00
Arnaud Porterie
d1b515dcc5 Update RELEASE-CHECKLIST.md
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-02-23 11:34:22 -08:00
Tianon Gravi
a936ea88da Fix dynbinary with new autogen code
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-02-23 11:19:51 -07:00
Michael Crosby
e82cf741e3 Merge pull request #10698 from crosbymichael/issue-triage
Add issue triage document
2015-02-23 10:18:04 -08:00
Michael Crosby
828e76a5aa Add issue triage document
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-20 17:19:08 -08:00
Tianon Gravi
f2d2862459 Merge pull request #10833 from fabianorosas/10832-fix-test-unit-without-parallel
Fix test-unit run without parallel
2015-02-20 12:12:46 -08:00
Fabiano Rosas
ab6ae7215e Fix export of BUILDFLAGS in test-unit. Closes #10832
Signed-off-by: Fabiano Rosas <farosas@br.ibm.com>
2015-02-20 16:25:10 -02:00
Michael Crosby
b32564798d Merge pull request #10665 from brahmaroutu/autogen_removeXflag
Removing -X flag option and autogenerating code to create Dockerversion....
2015-02-20 09:53:07 -08:00
Srini Brahmaroutu
6871b9b16a Removing -X flag option and autogenerated code to create Dockerversion.go functionality
Addresses #9207

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-02-20 05:40:12 +00:00
Alexander Morozov
a78ce5c228 Merge pull request #10872 from jfrazelle/ugh-tomlv
fix tomlv because it doesn't read from stdin
2015-02-19 20:31:34 -08:00
Jessica Frazelle
06685a53c1 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)
2015-02-19 13:18:20 -08:00
Steve Francia
d562f94d47 Merge pull request #10797 from tianon/strict-test-environment 2015-02-19 16:14:05 -05:00
Tianon Gravi
ed345fb18e 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>
2015-02-18 23:30:43 -07:00
Jonathan Dowland
b7a1776878 minor grammar suggestion
Signed-off-by: Jonathan Dowland <jdowland@redhat.com>
2015-02-18 16:26:24 +00:00
Jessie Frazelle
2243e32cbb Merge pull request #10764 from grossws/patch-1
Cleanup: changed ./hack to ./project in README.md
2015-02-16 13:30:02 -08:00
Jessie Frazelle
8b010d9f10 Merge pull request #10715 from icecrime/keyserver_install_dependency
Use gpg from our server if keyserver is down
2015-02-13 11:29:39 -08:00
Arnaud Porterie
f058e9c43c Use gpg keyserver pool
Make the install script independent from the ubuntu keyserver by using
the sks-keyservers pool instead.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-02-13 09:13:29 -08:00
grossws
8017cb0d3b [trivial] changed ./hack to ./project in README.md
Signed-off-by: Konstantin Gribov <grossws@gmail.com>
2015-02-13 18:11:16 +03:00
Ahmet Alp Balkan
e1be475c5b Change emptyfs path in integration-cli tests
This fixes the build break in Jenkins Windows CI tests and
fixes TestInspectImage for Windows CLI.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-02-12 15:02:18 -08:00
Jessie Frazelle
4c1da911a9 Merge pull request #10660 from tianon/static_build-tag
Update project/make/dynbinary to unset the static_build tag
2015-02-09 13:02:57 -08:00
Tianon Gravi
10a28da8fd Update project/make/dynbinary to unset the static_build tag
This allows us to use build tags in the code directly to include/exclude code based on our binary's "staticness".

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-02-09 09:30:09 -07:00
unclejack
196a7216a3 project/install.sh: install ca-certificates
This ensures that ca-certificates are installed and that they get
updated in case they were already installed.

Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2015-02-03 17:55:14 +02:00
Jessica Frazelle
d245a8a706 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)
2015-01-30 15:22:11 -08:00
Michael Crosby
87fd6375f1 Merge pull request #9943 from gdi2290/update-authors
Update AUTHORS file and .mailmap
2015-01-30 09:59:31 -08:00
Tianon Gravi
0fab79f203 Update .deb version numbers to be more sane
Example output:
```console
root@906b21a861fb:/go/src/github.com/docker/docker# ./hack/make.sh binary ubuntu
bundles/1.4.1-dev already exists. Removing.

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

---> Making bundle: ubuntu (in bundles/1.4.1-dev/ubuntu)
Created package {:path=>"lxc-docker-1.4.1-dev_1.4.1~dev~git20150128.182847.0.17e840a_amd64.deb"}
Created package {:path=>"lxc-docker_1.4.1~dev~git20150128.182847.0.17e840a_amd64.deb"}

```

As noted in a comment in the code here, this sums up the reasoning for this change: (which is how APT and reprepro compare versions)
```console
$ dpkg --compare-versions 1.5.0 gt 1.5.0~rc1 && echo true || echo false
true
$ dpkg --compare-versions 1.5.0~rc1 gt 1.5.0~git20150128.112847.17e840a && echo true || echo false
true
$ dpkg --compare-versions 1.5.0~git20150128.112847.17e840a gt 1.5.0~dev~git20150128.112847.17e840a && echo true || echo false
true
```

ie, `1.5.0` > `1.5.0~rc1` > `1.5.0~git20150128.112847.17e840a` > `1.5.0~dev~git20150128.112847.17e840a`

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-01-28 14:26:40 -07:00
Jessie Frazelle
13b6461570 Merge pull request #10398 from LK4D4/export_daemon_vars
Export DOCKER_GRAPHDRIVER and DOCKER_EXECDRIVER in integration-cli
2015-01-28 09:44:39 -08:00
Alexander Morozov
667dc58c39 Export DOCKER_GRAPHDRIVER and DOCKER_EXECDRIVER in integration-cli
This needed for our "small" testing daemon using same config as "big"
testing daemon.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-01-27 16:40:11 -08:00
Tibor Vass
bb4025c4e2 Merge pull request #10230 from tianon/emptyfs
Update emptyfs support to work properly if scratch is already an image
2015-01-27 15:01:42 -05:00
Jessie Frazelle
acb8e08296 Merge pull request #10362 from LK4D4/update_libcontainer
Update libcontainer to 2d3b5af7486f1a4e80a5ed91859d309b4eebf80c
2015-01-26 17:18:00 -08:00
Alexander Morozov
fd2d45d7d4 Update libcontainer to 2d3b5af7486f1a4e80a5ed91859d309b4eebf80c
This revision is from docker_1.5 branch, because we don't want to
introduce user namespace in docker 1.5, but fix for --pid=host is
needed.

Fixes #10303

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-01-26 14:00:44 -08:00
Solomon Hykes
77f840fb8b Proposal for an improved project structure.
Note: this deprecates the fine-grained, high-overlap cascading MAINTAINERS files,
and replaces them with a single top-level file, using a new structure:

* More coarse grained subsystems with dedicated teams of maintainers
* Core maintainers with a better-defined role and a wider scope (if it's
not in a subsystem, it's up to the core maintainers to figure it out)
* Architects
* Operators

This is work in progress, the goal is to start a conversation

Signed-off-by: Solomon Hykes <solomon@docker.com>
Signed-off-by: Erik Hollensbe <github@hollensbe.org>
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2015-01-25 20:00:59 +00:00
Jessica Frazelle
547c959576 Update project/make.sh to use execdriver buildtag if passed.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2015-01-23 16:18:39 -08:00
Tianon Gravi
51b5dc185b Update emptyfs support to work properly if scratch is already an image
Also, this decouples the emptyfs script from the busybox one -- they're now functionally separate thanks to the scratch no-op change. 👍

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-01-20 16:26:04 -07:00