Commit Graph

1934 Commits

Author SHA1 Message Date
ae62a09f9b Update "download-frozen-image-v2.sh" such that redirects are optional
If the registry responds directly with blob contents, use them,
otherwise follow the redirect without Authorization headers (which
likely aren't valid for the server being redirected to).

This preserves the basic structure of the previous output with up to one
additional progress bar per-layer (for the redirect request and then the
following blob request).

Signed-off-by: Tianon Gravi <admwiggin@gmail.com>
Upstream-commit: 4bbdc0b8f7b2faa3354738c300cfedb2b77c7316
Component: engine
2017-06-22 15:54:50 -07:00
862be7247c Update downloader script, to ensure that Authorization header is not passed when downloading blobs.
Signed-off-by: Alexander Midlash <amidlash@docker.com>
Upstream-commit: 5c38e4c16a0a51a0cffb4802ecc694e5f5bfbeed
Component: engine
2017-06-22 15:54:50 -07:00
ce27333614 Merge pull request #33776 from thaJeztah/remove-deprecated-mkimage
Remove deprecated contrib/mkimage-xyz scripts
Upstream-commit: 5f0062f0fa97adc480f2e15b20efb89f5cbe3b5b
Component: engine
2017-06-21 22:41:48 -07:00
02a0e27cd2 Remove deprecated contrib/mkimage-xyz scripts
The contrib/mkimage-busybox.sh, contrib/mkimage-debootstrap.sh,
and  contrib/mkimage-rinse.sh were deprecated in commit
51f707cf9dfb2dbe31cfd0cd92b922ca5d98e842, in favor of
their equivalents in contrib/mkimage/

Given that the deprecation warning has been in place
for over three years, it's save to now remove these.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d14fb3ac4e712e5927eaad33213b0910aa56ec13
Component: engine
2017-06-21 21:56:24 -07:00
10a4963c2c Remove pkcs11, libltdl-dev, and clang for osx.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b877fc31c51baaf1ec42501ab366dd05a5b6bb21
Component: engine
2017-06-21 11:18:44 -04:00
01e1289926 Add option for architecture to mkimage-alpine.sh
Signed-off-by: Robert Schneider <mail@shakeme.info>
Upstream-commit: 23f0c20b021849283fb422fab735d893c1946f46
Component: engine
2017-06-15 15:52:25 +02:00
6cc2ed537e Fix getopts in mkimage-alpine.sh
Signed-off-by: Robert Schneider <mail@shakeme.info>
Upstream-commit: a89d282dbb9eefe043a7a2dcfb146b11ade720d1
Component: engine
2017-06-15 15:51:56 +02:00
42c5a6e86e Remove docs (except docs/api), experimental/, contrib/completion, man/
They have been moved to github.com/docker/cli.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: b5579a4ce33af4c1f67118e11b5a01008a36d26a
Component: engine
2017-06-14 03:14:46 +00:00
cf3b267129 Update docs, completion scripts for disable-legacy-registry
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2b8f0eef7338f37104464154ba65aef7db3b9703
Component: engine
2017-06-12 11:04:37 +02:00
6ed8b96066 Fix downloading image fails when build docker
Generate a token for each download process to avoid token expired.

Closes: #33441

Signed-off-by: vanderliang <lansheng@meili-inc.com>
Upstream-commit: cb502cd4e894a78e723902a4d2f23174b69430ce
Component: engine
2017-05-31 14:21:32 +08:00
9ac5a90734 Bump go to go1.8.3
Note that go1.8.2 contains a security fix (CVE-2017-8932).

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 0c7c900e9e66335a6bd486be008af43ae83a5a37
Component: engine
2017-05-30 10:15:59 -04:00
af8a181696 Merge pull request #33095 from chrisdias/chrisdias/multistagebuild
syntax highlighting: support FROM...AS for multi stage build
Upstream-commit: 08894a7f237945c70ffc1790f5c297a416f85e87
Component: engine
2017-05-24 11:35:17 -07:00
c4ff71019e Merge pull request #33167 from utzb/rpmbuilds
adding rpm builds for ppc64le and s390x
Upstream-commit: 4050e3061ceaeeb6644e1a6fa33a69e81afba4c6
Component: engine
2017-05-24 17:24:23 +01:00
93de81213c Support FROM...AS syntax for multi stage build dockerfiles
Signed-off-by: chrisdias <cdias@microsoft.com>
Upstream-commit: 8523e9d108a0e98865673701a7bd0a7929c5260b
Component: engine
2017-05-22 18:12:10 -07:00
0e311d1c4e Merge pull request #33151 from nwt/push-foreign-layers
Add daemon option to push foreign layers
Upstream-commit: a30ef99e8dd2c3e7a54b6410a5709f61db59c07f
Component: engine
2017-05-17 02:04:31 +02:00
67b57727bd Add daemon option to push foreign layers
The --allow-nondistributable-artifacts daemon option specifies
registries to which foreign layers should be pushed.  (By default,
foreign layers are not pushed to registries.)

Additionally, to make this option effective, foreign layers are now
pulled from the registry if possible, falling back to the URLs in the
image manifest otherwise.

This option is useful when pushing images containing foreign layers to a
registry on an air-gapped network so hosts on that network can pull the
images without connecting to another server.

Signed-off-by: Noah Treuhaft <noah.treuhaft@docker.com>
Upstream-commit: 67fdf574d5acd6ddccb6ece0ffe0ace1c1608712
Component: engine
2017-05-16 14:36:36 -07:00
e5c39230b9 Merge pull request #32700 from jphuynh/more-maintainer-deprecation
MAINTAINER deprecation follow up. Relates to #25466
Upstream-commit: 20255ade2965440d22e149cdd7c32e207f6918ba
Component: engine
2017-05-13 17:28:52 +02:00
c4c8c3a703 Merge pull request #32437 from cpuguy83/container_selinux
Rely on container-selinux for centos/fedora25/rhel
Upstream-commit: c307f4521edc58df347897c84159f25606cae597
Component: engine
2017-05-12 09:23:17 -04:00
a2a647ff42 adding rpm builds for ppc64le and s390x
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Signed-off-by: Dominik Dingel <dingel@de.ibm.com>
Signed-off-by: Thorsten Winkler <thorsten.winkler@de.ibm.com>
Signed-off-by: Utz Bacher <utz.bacher@de.ibm.com>
Upstream-commit: 539e976aa9d5c6ffd25904ed961210628ff31c60
Component: engine
2017-05-12 01:26:55 +02:00
15d274d7a1 Merge pull request #33049 from albers/completion-log-options
Update bash completion for log driver options
Upstream-commit: d8908c3467683f9638abb85ae4d745e8821467d2
Component: engine
2017-05-12 01:02:34 +02:00
887d3ac7d1 Merge pull request #33108 from justincormack/revert-seccomp-sockets
Revert "Block obsolete socket families in the default seccomp profile"
Upstream-commit: 33ebf32cb0d0b865d002e8afd0c35b6474f04eb6
Component: engine
2017-05-12 00:30:08 +02:00
4a4d032afd Merge pull request #29030 from cpuguy83/go18_test
Update go to 1.8
Upstream-commit: ff86a9196bbb5a0410782f9171699680409c9465
Component: engine
2017-05-11 05:18:12 -07:00
5065cd9576 Merge pull request #33044 from albers/completion-dm-storage-opts
Add bash completion for new devicemapper storage options
Upstream-commit: 71d29266ff4f3bb3f43d6c50b115abf20cd02879
Component: engine
2017-05-10 17:59:56 -07:00
c9bef385b2 Update golang to 1.8
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 470dfd69b3a86d8966f51d3f7237bdb10d6e00e0
Component: engine
2017-05-10 20:06:27 -04:00
83279055ee Merge pull request #33045 from albers/completion--health-start-period
Add bash completion for `--health-start-period`
Upstream-commit: 2a7a938da42d5e522c3bdd455c5eb936dcc8f0df
Component: engine
2017-05-10 15:54:43 +02:00
c7bf74a6ab Revert "Block obsolete socket families in the default seccomp profile"
This reverts commit 7e3a596a63fd8d0ab958132901b6ded81f8b44c0.

Unfortunately, it was pointed out in https://github.com/moby/moby/pull/29076#commitcomment-21831387
that the `socketcall` syscall takes a pointer to a struct so it is not possible to
use seccomp profiles to filter it. This means these cannot be blocked as you can
use `socketcall` to call them regardless, as we currently allow 32 bit syscalls.

Users who wish to block these should use a seccomp profile that blocks all
32 bit syscalls and then just block the non socketcall versions.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: dcf2632945b87acedeea989a5aa36c084a20ae88
Component: engine
2017-05-09 14:26:00 +01:00
4f3eebb317 bash completion for stack deploy --prune
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 8f159358fb91be0bd47cc1fe60f3882ecf92f360
Component: engine
2017-05-08 10:14:15 +02:00
82696bf486 Update bash completion for log driver options
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: bad7d1fa2fcf22f0fb941d07d5d25fc4eea4f73f
Component: engine
2017-05-05 16:52:33 +02:00
5f6211cd9e Add bash completion for --health-start-period
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: cbf8c07e9ea30ceef1007fd2857ce2dab6d05517
Component: engine
2017-05-05 15:04:44 +02:00
e4b60b0fda Add bash completion for new devicemapper storage options
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 37747a0fcef5ca2d68023e5486afb4bc4d1ff50b
Component: engine
2017-05-05 14:31:22 +02:00
e517866d3b Rely on container-selinux for centos/fedora25/rhel
RH now provides `container-selinux` which provides everything we need
for docker's selinux policy. Rely on `container-selinux` where
available, and `docker-engine-selinux` when not.

This still builds the `docker-engine-selinux` package and presumably
makes it available, but is no longer a requirement in the
`docker-engine` package preferring `container-selinux` instead.

`container-selinux` is available on fedora24, however the version that
is available does not set the correct types on the `dockerd` binary. We
can use `container-selinux` and just supplement that with some of our
own policy, but for now just keep using `docker-engine-selinux` as is.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: adb2ddf288a893609f902ba9d4f4d4c45e4e730f
Component: engine
2017-05-01 11:23:18 -04:00
60079a8d66 Merge pull request #32882 from albers/completion-stack-ls--format
Add bash completion for `stack ls --format`
Upstream-commit: 68a5336b61c8b252966b582f0e4d08c6ae0bdb63
Component: engine
2017-04-27 15:13:05 -07:00
d23cd74237 Merge pull request #32884 from albers/completion-system-df--format
Add bash completion for `system df --format`
Upstream-commit: 294c9eab56970fa0b106d20560ee1110ea478c5d
Component: engine
2017-04-27 15:10:17 -07:00
c4a7515140 Merge pull request #32896 from albers/completion-attach
Add missing bash completion for `docker attach`
Upstream-commit: 420b67f892d5424be59a788a51e2c4e64bb9cd66
Component: engine
2017-04-27 13:57:27 -04:00
462b01fa63 Merge pull request #32887 from albers/completion-remove--init-path
Remove bash completion for `run|create --init-path`
Upstream-commit: 6b5a02e95c6f68db200c304bf084c1e4af13a11d
Component: engine
2017-04-27 13:53:47 -04:00
31e2336b4e Merge pull request #32883 from albers/completion-history--format
Add bash completion for `history --format`
Upstream-commit: 2881e2be587e5a16e3f1f5e9d5547263517c9c54
Component: engine
2017-04-27 10:51:12 -07:00
0c65c48987 Add missing bash completion for docker attach
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: afbd5a79ca56556e58032a994efd18537c9169fb
Component: engine
2017-04-27 16:59:32 +02:00
a0854b8fd2 Remove bash completion for run|create --init-path
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: b7a32e178029442be05bad39466418bd12e26145
Component: engine
2017-04-27 11:02:33 +02:00
c0b973c686 Add bash completion for system df --format
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 69a2ca0d4409911f9dc2c55cbb75fad908c717a3
Component: engine
2017-04-27 10:29:19 +02:00
956e1394b5 Add bash completion for history --format
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: c3e161fb52835823e6d00c5a4d94323cb0a09964
Component: engine
2017-04-27 10:18:55 +02:00
ccf66c24b8 Add bash completion for stack ls --format
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: b065ed3ec24037f4f66a0e4a2656505adb8287ee
Component: engine
2017-04-27 10:01:17 +02:00
17438d5f4c Inroduce SWARM --data-path-addr flag
This new flag will allow the configuration of an interface that
can be used for data path traffic to be isolated from control
plane traffic. This flag is simply percolated down to libnetwork
and will be used by all the global scope drivers (today overlay)

Negative test added for invalid flag arguments

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
Upstream-commit: 8dc8cd4719f165c01c98e7d3ce1d6cea6a8f60b8
Component: engine
2017-04-26 15:33:15 -07:00
e3d2b9b314 MAINTAINER deprecation follow up. Relates to #25466
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
Upstream-commit: 2c435ab8beba93509b957e4ac5e5801b86b5e8f1
Component: engine
2017-04-18 16:44:33 -05:00
d2b501cbdb Remove bogus statement from bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: ee785b1b9864e1f77ff04c684949a7f09f1d4934
Component: engine
2017-04-18 10:50:02 +02:00
97f903c29a Merge pull request #32597 from albers/completion-service-logs
Bash completion treats `docker service logs` as stable
Upstream-commit: b7794ac46f26c8a492f1926ba9b3bcbfbaf431d6
Component: engine
2017-04-13 09:29:16 -04:00
8bc9513322 Bash completion treats service logs as stable
Implements the following new CLI features:
- service logs is no longer experimental
- service logs also accepts task IDs

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 47615c9b9bfc947a2b244317188db54aa29c716e
Component: engine
2017-04-13 09:58:31 +02:00
3797bbe864 Fix bash-completion script.
bash-completion script for 'docker build --network' calls
__docker_plugins, the correct name for this function is
__docker_plugins_bundled.

Closes #32588

Signed-off-by: Corey Farrell <git@cfware.com>
Upstream-commit: eede2056fedf1b9d18c0dce216d5adde0bd394da
Component: engine
2017-04-12 21:36:29 -04:00
ac649e5b5e Fix inconsisticy for service logs
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 78b2c1a84a3be4f0004ebd277d8a88eb0ac9d006
Component: engine
2017-04-12 22:43:14 +08:00
5569e1d778 Remove Ubuntu 12.04 "precise pangolin" from build scripts
Ubuntu 12.04 will be EOL on April 28, after which it won't
receive updates and security fixes;
https://lists.ubuntu.com/archives/ubuntu-announce/2017-March/000218.html

This patch removes Ubuntu 12.04 from the build scripts

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 618d6bd0ce190b4186add0f8f5d7f8f380d6c7c5
Component: engine
2017-04-11 14:08:39 +02:00
4c139b77c0 Bash completion supports multiple stacks in stack rm
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: dc0523313e71a8d4bce4e63032c864bd96fd2831
Component: engine
2017-04-11 08:29:55 +02:00