beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
28315 commits 14 branches 412 tags 338 MiB
Commit graph

78 commits

Author SHA1 Message Date
Justin Cormack
3996975b08 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>
 2016-10-25 13:13:22 +01:00
Alexander Morozov
7d8831c091 project: update Go to 1.7.3 
List of milestone issues https://github.com/golang/go/issues?q=milestone%3AGo1.7.3

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-10-19 13:55:01 -07:00
cyli
5f4dcd8252 Bump vendored and dockerfile notary version to v0.4.2 
Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-10-14 17:52:56 -07:00
Kenfe-Mickael Laventure
7e12c3bb99 Update containerd and runc 
containerd: 837e8c5e1cad013ed57f5c2090c8591c10cbbdae
runc: 02f8fa7863dd3f82909a73e2061897828460d52f

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-10-05 14:47:15 -07:00
Michael Crosby
0b86ca9ad0 Merge pull request #26509 from LK4D4/commits_from_vendor 
project: move go binaries installation to separate script
 2016-10-05 13:15:30 -07:00
Alexander Morozov
1b41125ad9 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>
 2016-09-23 09:21:29 -07:00
Lei Jitang
a94067c07f Merge pull request #26803 from YuPengZTE/devFirstLetter 
Capitalizes the first letter in notes of dockerfile
 2016-09-23 04:27:52 -05:00
YuPengZTE
bd31b24336 Capitalizes the first letter in notes of dockerfile 
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
 2016-09-23 09:20:27 +08:00
Vincent Demeester
758a809f54 Merge pull request #26538 from LK4D4/update_grpc 
Update grpc to v1.0.1-GA
 2016-09-20 23:19:26 +02:00
Alexander Morozov
eeceb0ccc8 vendor: update containerd and swarmkit 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-09-20 09:24:36 -07:00
Michael Crosby
ee3ac3aa66 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>
 2016-09-19 17:33:50 -07:00
Alexander Morozov
e4ddcb37c1 libcontainerd: use healthcheck to track containerd conn 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-09-12 14:22:38 -07:00
boucher
6bc9a2d563 Update containerd to fix unkillable restored containers. 
Signed-off-by: boucher <rboucher@gmail.com>
 2016-09-08 21:31:56 -04:00
unclejack
1668894d04 Dockerfile*: bump Go to 1.7.1 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2016-09-08 00:42:35 +03:00
Daniel Nephin
d0fa13a502 Remove download of man page generator dependencies, which are now in man/Dockerfile.\* 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-07 11:02:51 -04:00
boucher
e0123adafd Upgrade containerd to latest version. 
Necessary for merging in #22049.

Signed-off-by: Ross Boucher <rboucher@gmail.com>
 2016-08-26 14:17:35 -04:00
Antonio Murdaca
12e2c2687e
Bump go to 1.7 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-08-21 19:04:15 +02:00
Brian Goff
37302bbb3f Merge pull request #25721 from cpuguy83/revendor_engine-api 
revendor engine-api
 2016-08-16 17:18:43 -04:00
Brian Goff
9ff0ab71a0 Bump docker-py 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-08-16 14:48:48 -04:00
Michael Crosby
2faeebc750 Merge pull request #24311 from ShevYan/incorrect-comments-in-dockerfile 
Dockerfile's comments for "Run the test suite" are out of date becaus…
 2016-08-12 15:53:06 -07:00
Kenfe-Mickael Laventure
d5cbc57eff Harmonize containerd commit used by all Dockerfile 
When #24648 was merged, only the main Dockerfile was updated with the
new containerd commit, this commit brings the other Dockerfile up to
speed.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-07-21 10:34:30 -07:00
Arnaud Porterie
ffba13f435 Merge pull request #24648 from mlaventure/fix-kill-test 
Fix TestDaemonRestartWithKilledRunningContainer failures on RHEL systems
 2016-07-19 18:24:34 +00:00
Sebastiaan van Stijn
589bafddf3
bump Go to 1.6.3 
following the announcement;
https://groups.google.com/forum/m/#!topic/golang-announce/7JTsd70ZAT0

> [security] Go 1.6.3 and Go 1.7rc2 pre-announcement
>
> Hello gophers,
> We plan to issue Go 1.6.3 and Go 1.7rc2 on Monday July 18 at approximately 2am UTC.
> These are minor release to fix a security issue.
>
> Following our policy at https://golang.org/security, this is the pre-announcement of those releases.
>
> Because we are so late in the release cycle for Go 1.7, we will not issue a minor release of Go 1.5.
> Additionally, we plan to issue Go 1.7rc3 later next week, which will include any changes between 1.7rc1 and tip.
>
> Cheers,
> Chris on behalf of the Go team

**Note:**
the man/Dockerfile is not yet updated, because
the official image for Go 1.6.2 has not yet
been updated.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-07-18 23:15:03 +02:00
Kenfe-Mickael Laventure
29b2714580 Vendor in new containerd 
This version introduces the following:
 - uses nanosecond timestamps for event
 - ensure events are sent once their effect is "live"

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-07-18 11:44:24 -07:00
Justin Cormack
d37a7394ac Add ltdl dependencies for aarch64 
Fixes `make test` and fix #24380 on aarch64

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-07 13:02:19 +01:00
Lei Jitang
276e234ca0 Install iproute2 and iputils-ping in Dockerfile.aarch64 
ping and ip command are need in integration-cli test, but
they are missing in ubuntu:wily.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-07-06 16:48:51 +00:00
Shev Yan
11280665b4 Dockerfile's comments for "Run the test suite" are out of date because there is no 'test' in hack/make directory. 
Signed-off-by: Shev Yan <yandong_8212@163.com>
 2016-07-04 22:43:53 +08:00
Kenfe-Mickael Laventure
2685c82c2e Vendor containerd 1b3a81545ca79456086dc2aa424357be98b962ee 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-07-01 11:46:48 -07:00
Sebastiaan van Stijn
ccab57620e Merge pull request #24028 from hqhq/fix_comments_in_aarch64 
Fix comments in Dockerfile.aarch64
 2016-06-29 11:06:29 -07:00
Qiang Huang
1997081096 Fix comments in Dockerfile.aarch64 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-06-28 14:31:34 +08:00
Michael Crosby
7db7e04631 Update containerd to b93a33be39bc4ef0fb00bfcb79147 
This updates containerd to b93a33be39bc4ef0fb00bfcb79147a28c33d9d43
fixing the start sync issues.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-06-27 11:45:05 -07:00
Akihiro Suda
cfe16e0d5b update go-md2man to v1.0.5 
Due to the issue of go-md2man, a numbered list in `man docker login` was not rendered correctly.
a8f937e113

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-06-23 01:58:37 +00:00
Kenfe-Mickael Laventure
b675124cf5 Vendor in runc cc29e3dded8e27ba8f65738f40d251c885030a28 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-06-15 15:11:50 -07:00
Kenfe-Mickael Laventure
1aec3bacfd Vendor in new runc binary with userns fix 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-06-14 07:47:31 -07:00
Kenfe-Mickael Laventure
2e9ea5c194 Update containerd and runc vendoring 
containerd: 860f3a94940894ac0a106eff4bd1616a67407ee2
runc: 85873d917e86676e44ccb80719fcb47a794676a1
runtime-specs: v1.0.0-rc1

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-06-14 07:47:31 -07:00
Michael Crosby
d17b9f3da0 Update containerd to cf554d59dd96e459544748290eb91 
This bumps containerd to cf554d59dd96e459544748290eb9167f4bcde509 and
includes various fixes and updates the grpc package and types generated
for use.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-06-07 15:27:23 -07:00
Michael Crosby
58b4164feb Merge pull request #23061 from thaJeztah/remove-GO15VENDOREXPERIMENT 
Remove GO15VENDOREXPERIMENT
 2016-05-27 16:54:19 -07:00
Sebastiaan van Stijn
b4708e2754
Remove GO15VENDOREXPERIMENT 
This environment variable is no longer
needed in Go 1.6 (as it's not the default).

Removed this environment variable from
all Dockerfiles except the Dockerfile.s390x,
which is still using gcc 5.3 (Go 1.5)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-05-27 18:15:01 +02:00
Christy Perez
d864a14620 Bump the seccomp versions to pull in fixes and new commits 
enabling s390 and ppc64le function

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
 2016-05-27 11:12:47 -04:00
Antonio Murdaca
40b21745cc Upgrade to golang 1.6.2 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-05-25 11:58:48 +02:00
cyli
6094be63ac Bump notary version up to 0.3.0 and re-vendor. 
Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-05-11 22:57:51 -07:00
Michael Crosby
cfb9764386 Update runc and containerd deps 
containerd:     57b7c3da915ebe943bd304c00890959b191e5264
runc:           d49ece5a83da3dcb820121d6850e2b61bd0a5fbe

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-05-09 15:05:44 -07:00
cyli
88c6675ed2 Bump notary version to v0.3.0-RC1 
Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-05-06 10:59:26 -07:00
Shijiang Wei
e6590b5fa2 vendor docker-py 7befe694bd21e3c54bb1d7825270ea4bd6864c13 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
 2016-05-02 23:04:04 +08:00
Michael Holzheu
6e4c87c06e Dockerfile.s390x: Build correct registries and notary client 
Sync with other Dockerfiles:

 1) Adjust REGISTRY_COMMIT
 2) Add old shema1 registry
 3) Install notary client

This fixes the following testcases:

 DockerSchema1RegistrySuite:
  - SetUpTest
 DockerTrustSuite:
  - TestTrustedBuildTagFromReleasesRole
  - TestTrustedBuildTagIgnoresOtherDelegationRoles
  - TestTrustedPullReadsFromReleasesRole
  - TestTrustedPullIgnoresOtherDelegationRoles
  - TestTrustedPushWithReleasesDelegationOnly
  - TestTrustedPushSignsAllFirstLevelRolesWeHaveKeysFor
  - TestTrustedPushSignsForRolesWithKeysAndValidPaths
  - TestTrustedPushDoesntSignTargetsIfDelegationsExist
 DockerRegistrySuite:
  - TestPullManifestList
  - TestCrossRepositoryLayerPush
 DockerHubPullSuite:
  - TestPullAllTagsFromCentralRegistry

v2: Sync comments on all architectures

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
 2016-04-29 19:24:49 +02:00
Mrunal Patel
e0f98c698b Update runc and spec dependencies for mount label 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>

Set up the mount label in the spec for a container

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2016-04-25 14:26:49 -07:00
Michael Crosby
199472c75a Bump containerd to v0.2.1 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-04-22 09:39:02 -07:00
Qiang Huang
e67c758ec3 Remove template code for runc and containerd 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-04-15 12:45:35 +08:00
Tibor Vass
7268eb97bc Bump Go version to 1.5.4/1.6.1 (security fix) (#21978) 
Go 1.6.1 is for ppc64le only.

https://groups.google.com/forum/#!msg/golang-announce/9eqIHqaWvck/kXsfO0ogLAAJ

Dockerfile.armhf cannot currently be updated.

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-04-13 11:22:48 -07:00
Tibor Vass
c3fe4226f3 vendor runc to fix issue#21808 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-04-12 15:35:43 -04:00