Commit graph

1970 commits

Author SHA1 Message Date
Vincent Demeester
f2533c0266 Merge pull request #29275 from cpuguy83/set_inspect_type_emptyfs
Set inspect type in ensure-emptyfs
2016-12-09 21:40:58 +01:00
Vincent Demeester
b8e1553765 Merge pull request #29231 from Microsoft/jjh/dcocheck
Windows: make.ps1 fix DCO check
2016-12-09 17:07:31 +01:00
Brian Goff
71ca76e8f2 Set inspect type in ensure-emptyfs
This keeps the test daemon logs from being flooded with calls to lookup
emptyfs for other types.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-12-09 08:26:05 -05:00
John Howard
e538c1fdca Windows: make.ps1 fix DCO check
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-12-07 17:58:07 -08:00
Justin Cormack
74ecec9199 Merge pull request #29174 from lhsvobodaj/29132-add-build-args-to-build-deb-script
Add variable DOCKER_BUILD_ARGS to build-deb script
2016-12-07 09:02:47 -08:00
Vincent Demeester
aefbc03444 Make sure we don't run integration cli test if compilation fails
Otherwise, while using test-integration-shell, it runs the tests using
the previously compiled test binary.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-12-06 23:37:08 +01:00
Luiz Svoboda
63aaf5e316 Add variable DOCKER_BUILD_ARGS to build-deb script
Some containers were being built (`docker build`) without
the DOCKER_BUILD_ARGS variable, which was causing some
issues because of the lack of network proxy configuration.

Fixes #29132

Signed-off-by: Luiz Svoboda <luizek@gmail.com>
2016-12-06 10:17:41 -02:00
Sebastiaan van Stijn
080d7a5543 Merge pull request #29145 from Microsoft/jjh/make
Windows: make.ps1 Throw exception on failure
2016-12-06 12:10:56 +01:00
Michael Friis
8d47858f96 remove bonus whitespace
Signed-off-by: Michael Friis <friism@gmail.com>
2016-12-05 20:21:25 -08:00
Victor Vieux
29e728e9b2 Merge pull request #29082 from runcom/fix-rpm-buildtime
hack/make.sh: fix BUILDTIME
2016-12-05 16:31:29 -08:00
John Howard
8c22a00b77 Windows: make.ps1 Throw exception on failure
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-12-05 09:58:56 -08:00
Akihiro Suda
4522f14f8c Fix bundle dir for integration-cli
test.main was unexpectedly created under docker/integration-cli/bundles/VERSION/test-integration-cli directory.
This commit moves test.main to docker/bundles/VERSION/test-integration-cli.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-12-05 09:07:38 +00:00
Dieter Reuter
0d7e118f01 Add support for running builds within an QEMU emulation
With this change we can run a Docker build in QEMU and build ARM or ARM64 binaries directly on an Intel build machine. This feature already supports building with Docker4Mac (Beta31). So it's easy for a developer to compile and test the Docker binaries locally on his dev machine w/o the need of the target hardware. Another use case would be to run builds on a clound CI like Travis to get an instant feedback loop for PR's, all on a common Intel platform w/o the need to set up the CI system on the target hardware.

Usage: build static Docker binaries for ARM 32-bit
```
DOCKER_ENGINE_OSARCH="linux/arm" make binary
```

Usage: build static Docker binaries for ARM64 aka AARCH64
```
DOCKER_ENGINE_OSARCH="linux/arm64" make binary
```

Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
2016-12-03 13:53:59 +01:00
Antonio Murdaca
7b1f77dcbc
hack/make.sh: fix BUILDTIME
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-12-03 09:09:41 +01:00
Sebastiaan van Stijn
ab56641ab5 Merge pull request #28964 from Microsoft/jjh/make
Windows: make.ps1 and dockerfile for native builds
2016-12-02 23:56:42 +01:00
John Howard
155435b6ce Windows: make.ps1 and Dockerfile for native builds
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-12-02 10:46:15 -08:00
Daniel Nephin
f247a99c6d Fix swagger-gen validation.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-12-02 12:11:35 -05:00
Alexander Morozov
5afdacb20e Merge pull request #28455 from Microsoft/jjh/autogen
Windows: Native autogen
2016-11-22 18:18:12 -08:00
Sebastiaan van Stijn
658b89192f Merge pull request #28703 from runcom/full-hash-commit-runc
hack/dockerfile/binaries-commits: use full commit hash for docker info
2016-11-22 21:14:00 +01:00
Tibor Vass
677e14643c Merge pull request #28595 from anusha-ragunathan/plugin_timeout
Allow HTTP client timeout to be configurable on plugin enable.
2016-11-22 10:17:10 -08:00
Andrew Hsu
f60541069c skip solaris and allow dry run control points
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2016-11-22 01:42:52 -08:00
Antonio Murdaca
fa15d5ed0f
hack/dockerfile/binaries-commits: use full commit hash for docker info
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-11-22 08:59:57 +01:00
Anusha Ragunathan
83ca993c15 Add HTTP client timeout.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-11-21 13:11:40 -08:00
Victor Vieux
79a891efb7 skip api/types/container/ (like golint) and fix one pkg
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2016-11-18 16:33:50 -08:00
Victor Vieux
e67664887d Merge pull request #28590 from mlaventure/update-containerd
Update containerd & runc
2016-11-18 14:08:56 -08:00
Aaron Lehmann
948e60691e Return warnings from service create and service update when digest pinning fails
Modify the service update and create APIs to return optional warning
messages as part of the response. Populate these messages with an
informative reason when digest resolution fails.

This is a small API change, but significantly improves the UX. The user
can now get immediate feedback when they've specified a nonexistent
image or unreachable registry.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-11-18 09:31:31 -08:00
Kenfe-Mickael Laventure
8b1aeb22fe Update containerd & runc
containerd: 03e5862ec0d8d3b3f750e19fca3ee367e13c090e
runc: 51371867a01c467f08af739783b8beafc15

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-11-18 08:15:20 -08:00
John Howard
64cc7677bf Windows: Native autogen
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-17 13:48:57 -08:00
Vincent Demeester
ce33d4e1c3
Update Tini to fix photon build-rpm compilation errors
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-17 22:03:32 +01:00
Victor Vieux
77fca662dd Merge pull request #28485 from Microsoft/jjh/remove-make.sh-old-hack
Remove old Windows hack in make.sh
2016-11-16 11:38:19 -08:00
Michael Crosby
1c29c3a54d Merge pull request #28420 from vieux/update_tini
update tini to a87614212b3a51a9cad57ff7989103a841546745
2016-11-16 09:46:11 -08:00
John Howard
5e6f8cb4a7 Remove old Windows hack in make.sh
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-16 09:29:38 -08:00
Vincent Demeester
2c342cff79
Build docker incrementally by default
This speeds up docker build time drastically. It still possible to
disable this by setting `DOCKER_INCREMENTAL_BUILD` to `0` (and this is
what should be done on the CI).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-15 16:23:48 +01:00
Victor Vieux
b1a91dcc0f update tini to a87614212b3a51a9cad57ff7989103a841546745
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-11-14 17:47:04 -08:00
Kenfe-Mickael Laventure
17df5593eb Remove extra binaries commit variables from windows build
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-11-11 08:24:17 -08:00
Victor Vieux
0427afa409 Merge pull request #27955 from mlaventure/runc-docker-info
Add external binaries version to docker info
2016-11-10 21:27:14 -08:00
Sebastiaan van Stijn
c4f1cb7791 Add Fedora 25 RPMs
This is a temporary version for building
Fedora 25. Fedora 25 will be released during
code-freeze, and is currently in beta, so no
official images are available yet.

Current release date is scheduled for 2016-11-15
https://fedoraproject.org/wiki/Releases/25/Schedule

Once released, the image will be updated for
GA

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-11-10 20:44:30 +01:00
Sebastiaan van Stijn
44c816a808 Merge pull request #27829 from DieterReuter/fix-aptrepo-distro-versions
Fix creation of the APT repo directory structure for similar distros
2016-11-10 16:23:27 +01:00
Daniel Nephin
be807639b0 Add validate/swagger-gen
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-09 14:44:16 -05:00
Kenfe-Mickael Laventure
2790ac68b3 Add expected 3rd party binaries commit ids to info
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-11-09 07:42:44 -08:00
Michael Crosby
d58b47623b Replace grimes with tini
There is no reason to duplicate efforts and tini is well built and
better than grimes.  It is a much stronger option for the default init
and @krallin has done a great job maintaining it and helping make
changes so that it will work with Docker.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-11-08 14:42:54 -08:00
Kenfe-Mickael Laventure
0aa17f0f60 Update containerd to 8517738ba4b82aff5662c97ca4627e7e4d03b531
This version:
 - properly follow context cancellation on Start and Exec
 - add support for Solaris
 - ensure exec exit events are always seen before init's

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-11-08 09:47:41 -08:00
Vincent Demeester
9075aa4ddd Merge pull request #28038 from bfirsh/add-validate-swagger
Validation for swagger.yaml
2016-11-08 10:57:01 +01:00
Tibor Vass
109c26bd74 Merge pull request #28056 from LK4D4/solaris_me
Add functional support for Docker sub commands on Solaris
2016-11-07 16:46:18 -08:00
Ben Firshman
5c4abd107a
Add swagger.yaml validation
- yamllint to ensure it is a valid YAML file
- go-swagger validate to ensure it is a valid swagger file

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-07 11:03:21 -08:00
Amit Krishnan
934328d8ea Add functional support for Docker sub commands on Solaris
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-11-07 09:06:34 -08:00
John Howard
d945441e23 Remove Windows CI stubs from hack/
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-05 21:01:06 -07:00
Kenfe-Mickaël Laventure
3a9322e9ec Merge pull request #28074 from dmcgowan/force-sha512-sign-repos
Use sha512 when gpg signing builds
2016-11-04 14:08:52 -07:00
Michael Crosby
cac13fc131 Merge pull request #27737 from justincormack/no-ambient-1.13
Revert ambient capabilities for 1.13
2016-11-04 12:52:21 -07:00
Justin Cormack
c5251f7116 Use runc version built without ambient capabilities
Until we can support existing behaviour with `sudo` disable
ambient capabilities in runc build.

Add tests that non root user cannot use default capabilities,
and that capabilities are working as expected.

Test for #27590

Update runc.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-04 17:25:28 +00:00