p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
27,378 Commits 2 Branches 295 Tags
7330d7eef706b671f0b1107c10b4e8a398203eea
Commit Graph

1799 Commits

Author SHA1 Message Date
Brian Goff
fe6c7fd94a re-vendor syslog package 
Fixes #26394

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: f528690674712b680caf2712092c7e2f8f236491
Component: engine
 2016-09-17 10:25:05 -04:00
Tõnis Tiigi
17ba48af4f Merge pull request #26583 from aboch/vnd 
Vendoring libnetwork @c8ce8c7
Upstream-commit: 4adbd5338d8f76e1a0895583f580993221451b08
Component: engine
 2016-09-15 20:28:07 -07:00
Alessandro Boch
a320cdf50c Vendoring boltdb @fff57c100 
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 5cfbdceafe87df8bab85c0561a1483d3191eb775
Component: engine
 2016-09-15 10:53:48 -07:00
Alessandro Boch
30accdf3a6 Vendoring libnetwork @c8ce8c7 
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 161c12142594d602ed46ef7601a57e3761d52f99
Component: engine
 2016-09-14 14:46:05 -07:00
Alexander Morozov
99577ad8e2 libcontainerd: use healthcheck to track containerd conn 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: e4ddcb37c1326e8eef7abbcc84effb016c7a3336
Component: engine
 2016-09-12 14:22:38 -07:00
Madhu Venugopal
63c413223c Merge pull request #26448 from michael-holzheu/PR-libnetwork-bump-to-fix-s390x-ci 
Vendor libnetwork @51d88e9ae63f
Upstream-commit: 130db0a4894abea39f6e9503711804d2807628bd
Component: engine
 2016-09-10 06:00:32 -07:00
Vincent Demeester
7e3f0fe810 Merge pull request #26303 from yongtang/26300-docker-images-3-fractional-digits 
Restrict size to 2 fractional digits for `docker images`
Upstream-commit: 4c3f2e7c376c83593188f6548652e9261209c908
Component: engine
 2016-09-10 11:32:45 +02:00
root
6bdcfc529e Vendor libnetwork @51d88e9ae63f 
- Fixes #26440

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Upstream-commit: 7d8048de06d6074dc83c973a48c1e1a1b60704b6
Component: engine
 2016-09-09 18:57:15 +02:00
boucher
820ac3028c Update containerd to fix unkillable restored containers. 
Signed-off-by: boucher <rboucher@gmail.com>
Upstream-commit: 6bc9a2d563ace9fa604de15731e263b353e83120
Component: engine
 2016-09-08 21:31:56 -04:00
Yong Tang
b896a9dba6 Revendor go-units to f2145db703495b2e525c59662db69a7344b00bb8 
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 6866fda800ab9adb9a88b60f6660b512401c921f
Component: engine
 2016-09-08 18:26:50 -07:00
Justin Cormack
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
Michael Crosby
fbcd483854 Merge pull request #26119 from cpuguy83/lazily_load_fixtures 
Move some test fixtures to go
Upstream-commit: 4e2d4429013ff4f6ca100063869b27b247f7da34
Component: engine
 2016-09-08 11:16:27 -07:00
Jana Radhakrishnan
690d211fb6 Vendor libnetwork @00e7660daeb4 
- Fixes #25325
  - Fixes certain issues with workers leaving swarm and rejoining
  - Adds cluster provider interface methods to support docker run on
    overlay in swarm mode.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 99c39680984018b345881a29d77a89f87958a57b
Component: engine
 2016-09-07 15:11:48 -07:00
Brian Goff
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
Jana Radhakrishnan
97719e4178 Vendor swarmkit @27fbaef4ceed6 
Adds a new task runtime to support network attachmemt for plain old
docker containers so that they can participate multi-host networks and
get access to services.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 39143ef15d6b95acc37f209c8ba5ebc4b3d57c79
Component: engine
 2016-09-07 11:52:49 -07:00
Brian Goff
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
Vincent Demeester
01c442fe23 Merge pull request #26275 from cpuguy83/verify_integration_tests 
Fail faster if integration tests don't compile
Upstream-commit: a0bbf54aa70b590fab33c916ad77573a62d69bf9
Component: engine
 2016-09-07 16:48:14 +02:00
Brian Goff
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
unclejack
a4d0659867 Merge pull request #26199 from bamarni/raspbian-overlay 
remove systemd drop-in unit on raspbian
Upstream-commit: 9fbe0f21565e9ef41393d5f211e9a7e5a51d0adc
Component: engine
 2016-09-05 04:45:47 -07:00
Vincent Demeester
637e45cd56 Merge pull request #26290 from tonistiigi/govet17 
Fix govet for go1.7
Upstream-commit: c73fae2352788323476759f4199b034b7ffc54dd
Component: engine
 2016-09-03 19:27:19 +02:00
Tonis Tiigi
833a33ebb8 Fix govet for go1.7 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 7a8c7b47cffa8485b03db715f78c087b01ae5dfa
Component: engine
 2016-09-02 19:07:54 -07:00
Bilal Amarni
9d1a7feea8 Remove systemd drop-in file on raspbian 
It makes systemd integration less intrusive, notably needed for
docker machine (cf. https://github.com/docker/machine/pull/3605).

The default storage driver would now be devicemapper, until the
deb package is updated.

Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com>
Upstream-commit: de078211b30e13825b596ff4b2798e0fb780551a
Component: engine
 2016-09-01 23:18:05 +02:00
Justin Cormack
a03ebc79ee Merge pull request #26200 from runcom/engine-api-vendor 
vendor docker/engine-api@f9cef59044
Upstream-commit: 8ccac1ad4de898583113d036810da3a35a9be906
Component: engine
 2016-09-01 10:51:34 +01:00
Antonio Murdaca
1965814a4e vendor docker/engine-api@f9cef59044 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 8f7a8c75ae251f1260299892c5de7c83224b110e
Component: engine
 2016-08-31 22:39:13 +02:00
Michael Crosby
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
Fabio Rapposelli
cc7e4cafad Add rpm builder for VMware Photon OS 
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
Upstream-commit: 6c7e1863d552afe156eb430575cbc0e1057a77e1
Component: engine
 2016-08-30 17:05:32 -07:00
Vincent Demeester
4cd762346d Merge pull request #25521 from allencloud/modify-vendor-script 
better vendor.sh to break when fail in grep
Upstream-commit: 92da332638597cf424090b16a90435ea4601891a
Component: engine
 2016-08-30 11:26:41 +02:00
allencloud
575d72a5b0 better vendor.sh to break when fail in grep 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: e06a8dc6be448082bc642675799e6f170d34d6d7
Component: engine
 2016-08-26 23:42:21 +08:00
Victor Vieux
e357d485dd add -f to plugin inspect 
Signed-off-by: Victor Vieux <vieux@docker.com>

Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 63a19edcb18b1bc650cc1d6eed78c2c3b376be62
Component: engine
 2016-08-25 22:40:05 -07:00
Tibor Vass
67ccfbdecc Merge pull request #25424 from vieux/enabled 
replace active by enabled for consistency in plugins
Upstream-commit: ed0dff8f16716b4f6debfc191124e98750dd05bb
Component: engine
 2016-08-26 15:22:41 -07:00
boucher
0ef65cbad6 Upgrade containerd to latest version. 
Necessary for merging in #22049.

Signed-off-by: Ross Boucher <rboucher@gmail.com>
Upstream-commit: e0123adafdc1e6a14a1dac10c5371da11b6fc063
Component: engine
 2016-08-26 14:17:35 -04:00
Victor Vieux
e44f33953e replace active by enabled for consistency in plugins 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: cf4e268115911e9e4a4da94dc00b2dc370f86a47
Component: engine
 2016-08-25 20:42:49 -07:00
Daniel Nephin
de17e6a998 Merge pull request #25354 from dnephin/remove-mflag-from-dockerd 
Convert docker and dockerd commands to spf13/cobra
Upstream-commit: 25587906d122c4fce0eb1fbd3dfb805914455f59
Component: engine
 2016-08-25 17:19:19 -04:00
Justin Cormack
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
Daniel Nephin
253b72c341 Update spf13/cobra vendor to v1.4.1 
Support command traversal

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ac40179e8a2780af45eaa78ab18607377ceca0e8
Component: engine
 2016-08-25 13:09:03 -04:00
Justin Cormack
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
Tonis Tiigi
d90e537965 vendor: update swarmkit in 8a761950f 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: ee030251f28a50d96634d58bc6396382c29a4281
Component: engine
 2016-08-22 11:36:06 -07:00
Sven Dowideit
c7c596011e Merge pull request #25835 from decoursin/patch-1 
Update apparmor error message
Upstream-commit: e168f0b4ad4dfc11a4423a6785d80153f0969808
Component: engine
 2016-08-22 15:47:23 +10:00
Antonio Murdaca
0f0bfaaffb Bump go to 1.7 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 12e2c2687e5c1f47287aa3668c8853ee8b5d6706
Component: engine
 2016-08-21 19:04:15 +02:00
Sebastiaan van Stijn
cdca524947 Merge pull request #25799 from vdemeester/25313-integration-no-cover 
Disable coverage on test-integration-cli
Upstream-commit: d6c75c31387cd144d4bd08c9bc3191ade16ad8ea
Component: engine
 2016-08-19 14:31:24 +02:00
Nick DeCoursin
4dc1ced56e Update apparmor error message 
Signed-off-by: decoursin <n.decoursin@foodpanda.com>
Upstream-commit: ae4ad3d955ffd5c31b3103914318dbfa49c17e9c
Component: engine
 2016-08-19 14:22:27 +02:00
Brian Goff
cd9d633b0a Merge pull request #25843 from darrenstahlmsft/RevendorHcsshim 
Vendor hcsshim to v0.4.2
Upstream-commit: 09e1de2080fd3b0bafb38adbd4b8c12ee949794d
Component: engine
 2016-08-18 17:21:02 -04:00
Vincent Demeester
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
Darren Stahl
c7c2901b56 Vendor hcsshim to v0.4.2 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: ba54581c3d4e388586100c53ee705eaac3c2201c
Component: engine
 2016-08-18 12:53:01 -07:00
Anusha Ragunathan
389d0f753e Vendor distribution changes. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 764d97444eb1ff41207a99b291346819ad1f51cd
Component: engine
 2016-08-18 09:30:31 -07:00
Brian Goff
f3a1d45b88 Merge pull request #25809 from justincormack/patricia 
Update go-patricia to 2.2.6
Upstream-commit: d8e12f87559ae21327820b3cd5abb0249ab47519
Component: engine
 2016-08-17 15:25:17 -04:00
Justin Cormack
891863d8ab Update go-patricia to 2.2.6 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: d16f96262e25487f84d6217bf4c224280a84d89f
Component: engine
 2016-08-17 19:02:32 +01:00
Michael Crosby
6c683fac48 Replace old oci specs import with runtime-specs 
Fixes #25804

The upstream repo changed the import paths.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 041e5a21dc0a8856448e3a9ad91e8535b8a7d00d
Component: engine
 2016-08-17 09:38:34 -07:00
Sebastiaan van Stijn
6964d60fa7 Merge pull request #25634 from darrenstahlmsft/RevendorHcsshim 
Revendor hcsshim to v0.4.1
Upstream-commit: 5e2a5199570169934fb80819356e5afb8bc6e8c1
Component: engine
 2016-08-17 10:50:00 +02:00
Darren Stahl
97adc78725 Revendor hcsshim 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: c58d0358c359e391707698b12850524137ef56ae
Component: engine
 2016-08-16 17:28:49 -07:00