Commit Graph

572 Commits

Author SHA1 Message Date
45f211246a 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>
Upstream-commit: 71ca76e8f20c33d313d2d0dffba0eddf39e69f9e
Component: engine
2016-12-09 08:26:05 -05:00
69c140812c Merge pull request #29174 from lhsvobodaj/29132-add-build-args-to-build-deb-script
Add variable DOCKER_BUILD_ARGS to build-deb script
Upstream-commit: 74ecec9199a2f1e9ff1ce52e254c8de65882ab4a
Component: engine
2016-12-07 09:02:47 -08:00
ea74b6e388 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>
Upstream-commit: aefbc034445df17c98f1247b100e2b6a2ed22e84
Component: engine
2016-12-06 23:37:08 +01:00
a8eab9725a 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>
Upstream-commit: 63aaf5e316d7b51db9be94bcb16dab07fdf1fdb4
Component: engine
2016-12-06 10:17:41 -02:00
ba5cfa2cc3 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>
Upstream-commit: 4522f14f8cd0d51ced18c24e0d7929409b82a212
Component: engine
2016-12-05 09:07:38 +00:00
beb7c759eb 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>
Upstream-commit: 0d7e118f0199102924c318c80b7e7a10720e1874
Component: engine
2016-12-03 13:53:59 +01:00
05a05baa0e Windows: make.ps1 and Dockerfile for native builds
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 155435b6ceeb05b2927ecc726216666b898b6459
Component: engine
2016-12-02 10:46:15 -08:00
0efec2f427 Windows: Native autogen
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 64cc7677bf891438a218cad6724ba86d70dcadec
Component: engine
2016-11-17 13:48:57 -08:00
9db7e23ff6 Remove extra binaries commit variables from windows build
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 17df5593ebcd471b0bbf0ea9d6e060ee3447850a
Component: engine
2016-11-11 08:24:17 -08:00
4d7a48f6ec Merge pull request #27955 from mlaventure/runc-docker-info
Add external binaries version to docker info
Upstream-commit: 0427afa409f1a2034537b4659bf7a3a1454fa617
Component: engine
2016-11-10 21:27:14 -08:00
949cb1d2cb 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>
Upstream-commit: c4f1cb779179b6145702174614706c462a5ceaae
Component: engine
2016-11-10 20:44:30 +01:00
7e57dfce61 Merge pull request #27829 from DieterReuter/fix-aptrepo-distro-versions
Fix creation of the APT repo directory structure for similar distros
Upstream-commit: 44c816a808198a38c3445c32614d4cef5d9f2736
Component: engine
2016-11-10 16:23:27 +01:00
515ebb7b5c Add expected 3rd party binaries commit ids to info
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 2790ac68b32b399c872de88388bdccc359ed7a88
Component: engine
2016-11-09 07:42:44 -08:00
64d7644ec8 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>
Upstream-commit: d58b47623b252803f5cd12f6d9ca584d1587ab22
Component: engine
2016-11-08 14:42:54 -08:00
f364a8ccb7 Merge pull request #28056 from LK4D4/solaris_me
Add functional support for Docker sub commands on Solaris
Upstream-commit: 109c26bd7482280946e356b33f17f4d82112dff3
Component: engine
2016-11-07 16:46:18 -08:00
6fb90ed484 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>
Upstream-commit: 934328d8ea650bf8a9c3c719999ce2a1f5dd5df6
Component: engine
2016-11-07 09:06:34 -08:00
c6c5a0aaa0 Remove Windows CI stubs from hack/
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: d945441e23e8c7a5ccd541062da8e206264127fb
Component: engine
2016-11-05 21:01:06 -07:00
854000b31e Merge pull request #28074 from dmcgowan/force-sha512-sign-repos
Use sha512 when gpg signing builds
Upstream-commit: 3a9322e9ec9ed64b1e165fb901fde0f8021471d3
Component: engine
2016-11-04 14:08:52 -07:00
b6c8ff694d Use sha512 when gpg signing builds
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 201f8043102efbbb624b3d70001878328cbbf655
Component: engine
2016-11-04 09:45:13 -07:00
61646d77af project: use vndr for vendoring
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: f2614f2107c838d014d31b806e3b8a9f1395cb2b
Component: engine
2016-11-03 15:31:46 -07:00
1747fa824e Add stubs for windows CI
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 9a2eb8b162e4df0533aeafc2e8d7bb9bbadb8234
Component: engine
2016-11-03 14:24:58 -06:00
dd0403a2eb Move validation out of hack/make
Allow each script to run directly without the hack/make.sh wrapper. These
scripts do not produce artifacts and do not benefit from the "bundles"
framework.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 22033e10034884734621f185b60ddaa119014480
Component: engine
2016-11-03 14:24:22 -06:00
63c8414c8b Don't include PowerShell completions in tgz
The PowerShell completion script was outdated,
and removed from this repository in
65fdbf0210e8faa1598515a7fd7ef4ed33d68d43.

A more up to date implementation can be found
here; https://github.com/samneirinck/posh-docker

Removing this script from the tgz

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 1be4b0e0ccbce268e308ff5955549b404751e0a9
Component: engine
2016-11-02 21:51:58 -07:00
30520bd0c0 project: fix build rpm
* change workdir for accessing install-binaries.sh
* use other gopath for binaries to preserve sources
* add sources of proxy and grimes to rpc spec
* use dynamic proxy with -linkmode external in deb and rpm

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: bf0fe87fe6acb0ad55539fdfa565dcdca8e343a5
Component: engine
2016-10-28 14:34:17 -07:00
310a244bc5 Include distro name into .deb filename
Right now we do have a problem to store the .debs for raspbian-jessie and
debian-jessie distro version for armhf arch. Both .debs have the same filename
so we have to include the distro version, too.

Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
Upstream-commit: 8b8d27fb7878874f6309ec8bb1ab7b967ec5ea1b
Component: engine
2016-10-28 20:59:49 +02:00
62c252366f Merge pull request #27735 from justincormack/completions-tgz
Add shell completions to tgz
Upstream-commit: 280eadf9bfbe328d6f18aa46d5ba4bad1f3f1d2a
Component: engine
2016-10-25 15:46:45 -07:00
ea2938292a Merge pull request #27519 from justincormack/proxy-build
Build docker-proxy from git checkout like other external binaries
Upstream-commit: 36f47aa2527f83d7ca7254c43eb08ffc5ce1102e
Component: engine
2016-10-25 08:54:13 -07:00
30025daf04 Add shell completions to tgz
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 1c6f5b5fff92fcb6220da7b9422f4d6134985fdf
Component: engine
2016-10-25 13:43:55 +01:00
44e77a4b4f Build docker-proxy from git checkout like other external binaries
This means we can vendor libnetwork without special casing, and
it is built the same way as the other external binaries.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 3996975b0840033bda3919440d122d734a4bc66b
Component: engine
2016-10-25 13:13:22 +01:00
9a299b360f Make experimental a runtime flag
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 7781a1bf0fef748877326632b88e92fbf3c90daa
Component: engine
2016-10-24 15:20:01 -07:00
9a717de600 Exclude generated types from linting.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4bfa2e634cec20685760abbeb605bcf1426f41d0
Component: engine
2016-10-20 13:24:23 -07:00
e50d97d8c8 project: unify way of installing runc and containerd
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 179479c6cdf44a2fd3d4ba2ce5dc176bc22ca9bf
Component: engine
2016-10-20 08:50:02 -07:00
391b6f94da Merge pull request #26509 from LK4D4/commits_from_vendor
project: move go binaries installation to separate script
Upstream-commit: 0b86ca9ad0916b62b7429f5d15821962bc4f7db0
Component: engine
2016-10-05 13:15:30 -07:00
6885c18aa4 Remove amd64 assumption in release.sh, cross and tgz scripts
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 61335bcb03ac60385bc19b6e1346b34cd168f7de
Component: engine
2016-10-03 15:46:42 -07:00
75e7ddadb0 project: move go binaries installation to separate script
It should allow easier updates for containerd and runc

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 1b41125ad9f1a3881b71bd044d76fd285170addb
Component: engine
2016-09-23 09:21:29 -07:00
38db9ff302 Merge pull request #26770 from YuPengZTE/devEG
'eg.' should be 'e.g.'
Upstream-commit: a7b0b6e2a9360115e9bca719f6bdb6e9d8fc3415
Component: engine
2016-09-21 10:03:23 -04:00
de0192fa30 'eg.' should be 'e.g.'
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
Upstream-commit: 0b86bca0b5c627ebb9524ecf5295c2c91e4bd8f5
Component: engine
2016-09-21 13:48:06 +08:00
8ee0f56810 Add init process for zombie fighting
This adds a small C binary for fighting zombies.  It is mounted under
`/dev/init` and is prepended to the args specified by the user.  You
enable it via a daemon flag, `dockerd --init`, as it is disable by
default for backwards compat.

You can also override the daemon option or specify this on a per
container basis with `docker run --init=true|false`.

You can test this by running a process like this as the pid 1 in a
container and see the extra zombie that appears in the container as it
is running.

```c

int main(int argc, char ** argv) {
	pid_t pid = fork();
	if (pid == 0) {
		pid = fork();
		if (pid == 0) {
			exit(0);
		}
		sleep(3);
		exit(0);
	}
	printf("got pid %d and exited\n", pid);
	sleep(20);
}
```

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: ee3ac3aa66bfb27b7c21dfb253fdaa113baedd4e
Component: engine
2016-09-19 17:33:50 -07:00
e2b900a8b1 Merge pull request #26375 from cpuguy83/fix_apt_mirror_propagation
Propagate BUILD_APT_MIRROR and consume in buil-deb
Upstream-commit: da7a7f9b769f6c1ccc88526390a3ff6528e31eb9
Component: engine
2016-09-09 00:02:42 +01:00
cecd3ec1b9 Move some test fixtures to go
moves ensure-frozen-images to go
moves ensure-syscall-test to go
moves ensure-nnp-test to go
moves ensure-httpserver to go

Also makes some of the fixtures load only for the required tests.
This makes sure that fixtures that won't be needed for a test run such as
`make TESTFLAGS='-check.f Swarm' test-integration-cli` (for example)
aren't loaded... like the syscall tests.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: ff91276d1f5beab5582d9ca582ee01af13198333
Component: engine
2016-09-07 17:30:35 -04:00
2a13e97eec Propagate BUILD_APT_MIRROR and consume in buil-deb
Passses down BUILD_APT_MIRROR to the docker env.
Ensures BUILD_APT_MIRROR is used when building debs, but only when the
consuming `Dockerfile` actually uses it, otherwise it will cause the
build to fail (e.g. on Ubuntu builds we aren't using APT_MIRROR).

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: f672a963c9f1225daec9d2d12577f95936dee51e
Component: engine
2016-09-07 10:57:00 -04:00
b03700a5d5 Verify integration tests before building bundles
Adds a new bundle `verify-integration-tests` which pre-compiles a test
binary for the integration tests.

This makes sure that the integration tests will actually compile before
doing other tasks which take much longer, such as building dockerd and
loading test fixtures.
When it comes time to actually run the tests, the pre-compiled binary
will be used so it doesn't have to compile the tests a 2nd time.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 4d0275c8192ca39d88f7dbe1e59ec03b544b6696
Component: engine
2016-09-06 20:27:28 -04:00
abf975f617 Output docker-py test results in xunit format
This adds a `results.xml` to the test-docker-py output folder.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: a9e513867cd9eb327ae56877886ed18a5ad5b691
Component: engine
2016-08-31 09:35:49 -07:00
49618f0083 All supported Go versions have -cover now
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: f243bfbc9d3879be33946d92801cc0f3e7290b17
Component: engine
2016-08-25 18:24:35 +01:00
4d71bb6be2 Remove gccgo support
Since Go 1.7, s390x uses upstream Go, so we have no reason to
support gccgo any more.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: eda90f63446253f97d2011926555306f2417d208
Component: engine
2016-08-24 11:09:35 +01:00
75edb24b6f Disable coverage on test-integration-cli
Temporarly remove cover bundle from defaults.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 5ec6e11e157b94d56bc2d7aa8e94cf7e72f51871
Component: engine
2016-08-18 22:12:24 +02:00
a8ef6a6a87 release-rpm: fix bad destination paths for rpms
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: e1c7ad871f6fd41a7682cf7effb02838ab679ae3
Component: engine
2016-08-12 16:51:12 -07:00
6221e2aa8d Make release scripts architecture-agnostic and add ARM support
This patch allows to only release the packages that were built and are
present under the bundles/ directory instead of assuming packages exist
for all distros enumerated in the contrib/builder/ directory.

It also now adds support for armhf architecture for apt repositories.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 2ff2e9a73076b737948c68c26f26b7bda5ac7db8
Component: engine
2016-08-11 11:18:52 -07:00
874b6f9cd1 Merge pull request #25334 from crosbymichael/selinux-fedora
Add selinux policy per distro/version
Upstream-commit: fc40ed24d810ea481dd358990926bc57d40c308d
Component: engine
2016-08-10 11:40:33 -07:00
293fa410c5 Merge pull request #24948 from dnephin/support-iterative-integration-testing
Support running integration tests without restarting a daemon
Upstream-commit: 8a81986a583a9e1a146931373608fbff378d09a2
Component: engine
2016-08-05 14:23:24 -04:00