Commit Graph

45 Commits

Author SHA1 Message Date
f15ebde7e0 Bump notary version up to 0.3.0 and re-vendor.
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 6094be63ac3d29c23024daa2152719b653c78092
Component: engine
2016-05-11 22:57:51 -07:00
783763f84c Update runc and containerd deps
containerd:     57b7c3da915ebe943bd304c00890959b191e5264
runc:           d49ece5a83da3dcb820121d6850e2b61bd0a5fbe

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: cfb976438677b15ec023b2ad4822bf1b2f63cc8f
Component: engine
2016-05-09 15:05:44 -07:00
f2c113ad8c Remove the pkcs11 build tag from the s390x Dockerfile, since it is using GCCGo 5.3, which
is still on the Go 1.4 library, whereas the Notary Yubikey library needs interfaces from
Go 1.5

Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 4710ed6304b8456060f4cb4401b2ed47343991e4
Component: engine
2016-05-06 10:59:28 -07:00
67162abf1a Bump notary version to v0.3.0-RC1
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 88c6675ed2d61dfb56434dd15391f01147abc5e6
Component: engine
2016-05-06 10:59:26 -07:00
26d82a2984 vendor docker-py 7befe694bd21e3c54bb1d7825270ea4bd6864c13
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: e6590b5fa2c442546d3dcfa3e0580eb024ede823
Component: engine
2016-05-02 23:04:04 +08:00
943ca18608 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>
Upstream-commit: 6e4c87c06e95f8c1aea0fa6d6575ff8c9faf8e03
Component: engine
2016-04-29 19:24:49 +02:00
1fe350f74d Dockerfile.s390x: Add upstream libseccomp to compile runc
The runc compile currently fails on s390x:

 Step 35 : RUN set -x    && export GOPATH="$(mktemp -d)" && git clone
 https://github.com/opencontainers/runc.git
 "$GOPATH/src/github.com/opencontainers/runc"       && cd
 "$GOPATH/src/github.com/opencontainers/runc"      && git checkout -q
 "$RUNC_COMMIT"  && make static BUILDTAGS="seccomp apparmor selinux"     &&
 cp runc /usr/local/bin/docker-runc

 [snip]

 # github.com/seccomp/libseccomp-golang
 Godeps/_workspace/src/github.com/seccomp/libseccomp-golang/seccomp.go:25:22:
 fatal error: seccomp.h: No such file or directory
  // #include <seccomp.h>

The problem is that the installed libseccomp version in trusty is too old.

Fix this and install version 2.3.0 of libseccomp like it is done in the
x86 Dockerfile.

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Upstream-commit: 97f45bd629fa3e5921c5a70f3e8087c1afbb07a6
Component: engine
2016-04-27 18:57:15 +02:00
b0763649ac Merge pull request #22275 from Microsoft/jstarks/no_rsrc
Windows: Add file version information
Upstream-commit: 78895c92c2baab420ae73322cc3d15009efa221e
Component: engine
2016-04-25 20:53:19 -07:00
3ee9fe57f8 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>
Upstream-commit: e0f98c698b49e3790fe63bff611eeda6f5b46055
Component: engine
2016-04-25 14:26:49 -07:00
773053356a Merge pull request #22118 from michael-holzheu/22007-s390x-fix-notary-build-for-gcc-v2
Create "src" symlink for building notary with gcc 5
Upstream-commit: d03ba27b76a5dee1d4e6306c66e6e842f41275fa
Component: engine
2016-04-25 11:50:00 -04:00
f103a2320b Windows: Add file version information
This change adds file version information to docker.exe and dockerd.exe by
adding a Windows version resource with the windres tool.

This change adds a dependency to binutils-mingw-w64 on Linux, but removes
a dependency on rsrc. Most Windows build environments should already have
windres if they have gcc (which is necessary to build dockerd).

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 4677f8036e8d090303ef76cbbe4f703d5c85d752
Component: engine
2016-04-24 10:55:51 -07:00
95b25f51f9 Create "src" symlink for building notary with gcc 5
With gcc 5 version 1.4.2 of go is included. This version does not support
go's "native vendoring" which is needed to build notary since git commit
51dc1747e4ab5 ("Move the godeps workspace to the vendor directory to be
compliant with Go 1.6").

As a workaround create a symlink "vendor/src" that points to "vendor/".
This allows to compile notary with gcc 5.

Closes #22007

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Upstream-commit: 241898d136e41f80ab2dda95078f971a8248675d
Component: engine
2016-04-22 19:28:08 +02:00
de7c442d63 Bump containerd to v0.2.1
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 199472c75a8e0c60108399de2da0247af1a0bdab
Component: engine
2016-04-22 09:39:02 -07:00
a91eed9e9d Remove template code for runc and containerd
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: e67c758ec373745300317786a27d639082a3d18d
Component: engine
2016-04-15 12:45:35 +08:00
ec5e265b2a vendor runc to fix issue#21808
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: c3fe4226f3aec1c59f581e636aece9cefaa9a515
Component: engine
2016-04-12 15:35:43 -04:00
ac4137daba Define readonly/mask paths in spec
This vendors in new spec/runc that supports
setting readonly and masked paths in the 
configuration. Using this allows us to make an
exception for `—-privileged`.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 3f81b4935292d5daedea9de4e2db0895986115da
Component: engine
2016-04-04 18:55:55 -07:00
1917da0dad Bring back support for DOCKER_RAMDISK
Fixes #21631

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 8a4225cd5ad3ad56a7e896f675080c0ed38982a3
Component: engine
2016-03-31 10:29:32 -07:00
1df524adbf Merge pull request #21629 from thaJeztah/bump-runc
Bump runC to 40f4e7873d88a4f4d12c15d9536bb1e34aa2b7fa
Upstream-commit: 71cab5b0dc904033f3869210441547a7e201c281
Component: engine
2016-03-29 23:07:12 -07:00
b882239dcc Merge pull request #21591 from riyazdf/hardware-signing-non-experimental
move hardware signing out of experimental, remove yubico-piv-tool deps
Upstream-commit: d800be743db5bcd1bfdcd948619af5811ff7aec8
Component: engine
2016-03-30 00:09:22 -04:00
05c587d41d Bump runC to 40f4e7873d88a4f4d12c15d9536bb1e34aa2b7fa
This includes fixes for;

- outputing errors for missing seccomp options on seccomp versions < 2.3
- cap set apply EPERM errors on ARM systems

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 752b31d3fe6fcbea9e14247c3896334734eba7f2
Component: engine
2016-03-29 17:10:05 -07:00
5888c28b47 Merge pull request #21592 from anusha-ragunathan/docker-systemd
When using systemd, pass expected cgroupsPath and cli options to runc.
Upstream-commit: 99adcaebc0aca57f2665f356e4a9b4218aa5d5f7
Component: engine
2016-03-29 17:00:10 -07:00
3b9321568d When using systemd, pass expected cgroupsPath and cli options to runc.
runc expects a systemd cgroupsPath to be in slice:scopePrefix:containerName
format and the "--systemd-cgroup" option to be set. Update docker accordingly.

Fixes 21475

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 7ed3d265a4499ec03f10537fea0aac3ebaa0cec6
Component: engine
2016-03-29 14:20:10 -07:00
eecbb6fc3c Use https for git clone in build
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: a7e9bf6cb70117005dbcd4a987a7f30e3c605656
Component: engine
2016-03-29 09:35:42 +02:00
8080d1d7e4 move hardware signing out of experimental, remove dependencies to yubico-piv-tool
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 8d18e6b30f0a33463c749079d87cad8fa9c19d52
Component: engine
2016-03-28 14:33:06 -07:00
9a08ed06d7 Merge pull request #21499 from cyli/hardware-signing-experimental-again
Move hardware signing back to experimental again
Upstream-commit: d5019972e5d3ec800a1bef0cd2250b2ad9484100
Component: engine
2016-03-24 23:03:13 -07:00
ba23c7ef71 Revert "Merge pull request #21003 from riyazdf/hardware-signing-ga"
This reverts commit e6d3a9849c96201681915944947a0e5452619929, reversing
changes made to d3afe34b51e7588984cc21a2f48da116645e52e3.

Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: dd33d18045e50a198d3d75db8fba12f126e93937
Component: engine
2016-03-24 21:12:52 -07:00
e7eeee7715 Downgrade to Go 1.5.3.
To not hit the issue with the request Host header.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3e0bd74a3d2647fa8c7783f4a053ad225746e6eb
Component: engine
2016-03-24 19:15:10 -04:00
10e1615e9a Update runc/containerd
Contains fixes for:
- pid.max fix that is causing hang on network stats test.
- fix for early stdin close containerd-shim
- better logging for `could not synchronise with container process`

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 22d997b3745e278d5a2b0b85d56c0d2b166e3a74
Component: engine
2016-03-23 15:38:33 -07:00
ce07920e99 Add docker- prefix to runc and containerd binaries
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 009399dc8ed8a4b635b0e229bf07b685e286d8d9
Component: engine
2016-03-23 00:52:16 -04:00
20a8382c82 vendor notary for docker1.11
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: ab3772f72fcb189c742510326069474ea625042f
Component: engine
2016-03-22 11:28:19 -07:00
8ba16d91c8 Replace execdrivers with containerd implementation
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 9c4570a958df42d1ad19364b1a8da55b891d850a
Component: engine
2016-03-18 13:38:32 -07:00
6a7d53836d Move pkcs11 out of experimental, into GA
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 37fa75b3447007bb8ea311f02610bb383b0db77f
Component: engine
2016-03-07 10:07:40 -08:00
534b2f0779 Vendor in notary v0.2.0
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 84dc2d9e70f1ad4422732421e2d6b91274f4dfae
Component: engine
2016-02-25 13:40:00 -08:00
47313c7b66 Switch Dockerfile to debian:jessie
Fixes broken-pipe issue when piping s3cmd to grep -q, by removing the -q
flag and redirecting to /dev/null instead.

Add net-tools for ifconfig, because some tests rely on ifconfig.

Harmonize all Dockerfiles in this direction.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: f27b5dda4afc0b0a278eb5379d17dfc3533c5397
Component: engine
2016-02-12 21:49:54 -05:00
c57100a022 Need -lpthread to compile Notary
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 6b09413f6bf309ad8103a0161dc826fc36af2a56
Component: engine
2016-01-29 19:52:39 +00:00
ee8542db2e Include a new version of notary with less verbose INFO+ logging
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 71a1caddf0af51cfc79db04f80513b292adb0231
Component: engine
2016-01-27 09:46:26 -08:00
65cf98bf38 Re-vendor notary, as well as change jfrazelle/go to docker/go.
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 8fd2c8791d9c7cf0dd28b77565f0a04349a8c9a2
Component: engine
2016-01-26 18:02:00 -08:00
81922b0d60 Update notary to 1.10-3 in all Dockerfiles
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 589c8a879fea758007a36bd0f00d07aa1000d0cb
Component: engine
2016-01-26 11:51:22 -08:00
2365ad5675 Switch "syscall-test" image from "debian:jessie" to "buildpack-deps:jessie" so that "gcc" is already included
This results in a significant time savings during repeated builds (since we don't have to re-download gcc for every test run).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 9b2aab3fc85ab1d8cf7479b153e54d5dcceb7886
Component: engine
2016-01-14 13:51:30 -08:00
2ca875c002 Update docker-py commit to the latest HEAD.
To fix issues with IPAM options.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: db41c5f5a5fe78aaf851f1c652661ab32e77c788
Component: engine
2016-01-12 13:19:17 -05:00
819eda8142 Refactor multi-arch support (especially for new mostly-official multi-arch official images)
See 99433d2ca2/README.md (architectures-other-than-amd64) for some context of where these images come from.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 91201678c6f58a5e46fe302bed9eb55a7ddcf693
Component: engine
2016-01-06 14:34:29 -08:00
cc9801b915 Add unshare image to s390x Dockerfile
This adds unshare image to Dockerfile.s390x

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 52e53814ea860919f8ddf2c82a6b24d41630072c
Component: engine
2015-12-14 12:16:18 -06:00
6140358db6 Fixes for ppc64le and 390x frozen-images
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 03fc212b6d6c2b3ecff42f33b7b3a7181043b09e
Component: engine
2015-12-08 14:26:34 -05:00
9f1a5d95f2 Dockerfile: add python-dev to fix Python.h errors
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 92756bdcdddc75bcf5aa7dab2c8238abdb18ab75
Component: engine
2015-11-22 12:32:10 +02:00
cf05bcf15c Build and test Docker on IBM Power and Z using gccgo. Enable CI on Power and Z.
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: b1cc78b8f5d0c85c80c04a15fa791025ae7d22e6
Component: engine
2015-11-14 03:16:45 +00:00