Andrew Hsu
26c6ae9770
refactor centos-7 Dockerfile for multi-stage
...
Also moved package deps into spec file BuildRequires. Had to hard-code
Epoch in spec file in order to realize deps with yum-builddep.
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 784a53cec5061e6a718acc3a7104c61215c15078
Component: packaging
2018-08-12 07:54:44 +00:00
Andrew Hsu
b290116fb4
hardcode epoch so yum-builddep will work
...
Looks like yum-builddep will only work if rpmlint passed on the spec
file and the spec file errors out on Epoch not being hardcoded.
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 42b49f6556022ecba47801f4639ddbc7864c9fe0
Component: packaging
2018-08-12 07:48:14 +00:00
Andrew Hsu
4ae3a83348
DISABLE_WARN_OUTSIDE_CONTAINER when building RPMs
...
This will save time waiting for timeout to expire.
Upstream-commit: 11a6221a830d7ffc3291e5b8749e364b18e07626
Component: packaging
2018-08-12 07:42:50 +00:00
Brian Goff
feccebcffe
Decouple logfile from tailfile.
...
This makes it so consumers of `LogFile` should pass in how to get an
io.Reader to the requested number of lines to tail.
This is also much more efficient when tailing a large number of lines.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 94a10150f64a24793216f5324a34e62be3f31a2d
Component: engine
2018-08-10 21:02:19 -07:00
Brian Goff
2835149d80
Add func to get an io.Reader for tail operations
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 874867d4e575ef805d71759e703e4f11cce05bd3
Component: engine
2018-08-10 21:01:15 -07:00
Brian Goff
be5744ef79
Add partial log metadata to log driver proto
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: e78ec2aab69068074038ee01bc89b75254a044b7
Component: engine
2018-08-10 20:44:30 -07:00
Eli Uriegas
f395016eaa
Change runc compilation to static
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 1cd96d5f686b389920ba01d0b230d7c29148e8ba
Component: packaging
2018-08-10 21:33:59 +00:00
docker-unir[bot]
79bec603a6
Merge pull request #138 from jose-bigio/fix_Makefile_var
...
Merged with https://github.com/seemethere/unir
Upstream-commit: d7f8fe075d4bd078afbd71e5d29c2f2a3dae4ce7
Component: packaging
2018-08-10 20:19:28 +00:00
Jose Bigio
1f4ebac506
Fix static version variable
...
Signed-off-by: Jose Bigio <jose.bigio@docker.com >
Upstream-commit: 507c9f84ccc3f83c978aeefa2f0377ed0c14c3b8
Component: packaging
2018-08-10 13:12:48 -07:00
Arash Deshmeh
0b69793ee3
refactor stack ps tests to table-driven
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 340e4ee8e5
Component: cli
2018-08-10 15:13:45 -04:00
Tibor Vass
16b520e100
builder: do not cancel buildkit status request
...
This fixes a bug when the build results in an error and instead of sending
the logs of the container to the client, it signals a cancelation.
The context should not be wired to the status request, as only the
build requests need to be canceled.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: f1ef16c736b477be17f6bc1bce18d0958a87d840
Component: engine
2018-08-10 17:29:32 +00:00
Eli Uriegas
31a1aed04a
Change final image to be a scratch image
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 08c4ef675e42077a7407143f5e94d53b198b1a0f
Component: packaging
2018-08-10 16:53:25 +00:00
GordonTheTurtle
af7228d929
Merge component 'cli' from git@github.com:docker/cli master
2018-08-10 12:36:59 +00:00
Silvin
70a91dd01b
Merge pull request #1283 from adshmh/refactor-trust-revoke-tests
...
refactor trust revoke command unit tests
Upstream-commit: 3a3e720f91
Component: cli
2018-08-10 11:03:58 +02:00
Vincent Demeester
e3e25812ec
Merge pull request #1280 from adshmh/refactor-trust-inspect-tests
...
refactor trust inspect command unit tests
Upstream-commit: 560b0cd863
Component: cli
2018-08-10 10:37:53 +02:00
Arash Deshmeh
ea09ac3378
refactored trust revoke command unit tests to use table-driven style
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 984d76b9dd
Component: cli
2018-08-09 15:58:54 -04:00
GordonTheTurtle
f68f53a53c
Merge component 'cli' from git@github.com:docker/cli master
2018-08-09 16:36:51 +00:00
Sebastiaan van Stijn
e2e1350a4c
Merge pull request #1266 from adshmh/use-natural-sort-order-for-network-list
...
use sortorder library for sorting network list output
Upstream-commit: 6ef11c516d
Component: cli
2018-08-09 12:05:55 +02:00
GordonTheTurtle
ea9e6f1a60
Merge component 'engine' from git@github.com:docker/engine master
2018-08-09 01:03:02 +00:00
Akihiro Suda
b552588bbc
Merge pull request #37609 from seratch/fix-typos
...
Fix the several typos detected by github.com/client9/misspell
Upstream-commit: 4122eb1a43a42c4c8b827b4d0fb3d6543f9f2c91
Component: engine
2018-08-09 08:48:05 +09:00
GordonTheTurtle
2cb7dab3fc
Merge component 'engine' from git@github.com:docker/engine master
2018-08-08 21:00:38 +00:00
Tibor Vass
71cb67c2af
Merge pull request #37582 from andrewhsu/bk
...
vndr containerd to a88b631, buildkit to e57eed4, and fsutil to b19464c
Upstream-commit: a3e78ca0c6a1a20c5ffeeaa51e3e0b4ff623a464
Component: engine
2018-08-08 10:55:19 -07:00
Arash Deshmeh
64bf68b122
refactor trust inspect command unit tests to table-driven style
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: f8f0d72cf9
Component: cli
2018-08-08 13:50:00 -04:00
Arash Deshmeh
7435e1c862
use sortorder lib for sorting the output of volume list command
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 5cc1f9006a
Component: cli
2018-08-08 12:20:21 -04:00
Arash Deshmeh
73b3c56c30
use sortorder lib for sorting in trust package
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 04bb3c770f
Component: cli
2018-08-08 12:20:10 -04:00
Arash Deshmeh
21c2c41660
use sortorder lib for sorting network list output
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: a921313caf
Component: cli
2018-08-08 12:06:59 -04:00
Kazuhiro Sera
71a3e53c36
Fix the several typos detected by github.com/client9/misspell
...
Signed-off-by: Kazuhiro Sera <seratch@gmail.com >
Upstream-commit: 1e49fdcafc6601cd9dd5c46551ee283baa0272ef
Component: engine
2018-08-09 00:45:00 +09:00
docker-unir[bot]
ae672e2b0e
Merge pull request #135 from jose-bigio/top_level_make
...
Merged with https://github.com/seemethere/unir
Upstream-commit: 0b376627615b15ea2a17b5c97bd7b975b910ea10
Component: packaging
2018-08-07 21:52:06 +00:00
Jose Bigio
7c303cf2e5
Add top level make target
...
Signed-off-by: Jose Bigio <jose.bigio@docker.com >
Upstream-commit: 9bb08342efcf1d9e69cbeca9b820309c9622bef5
Component: packaging
2018-08-07 14:28:11 -07:00
Eli Uriegas
2f9ebb742f
Merge pull request #134 from jose-bigio/make_image_tars
...
Add tar targets for engine image
Upstream-commit: d645291be026da9e2aab9906e0d0918d0799c3f3
Component: packaging
2018-08-07 13:47:31 -07:00
Jose Bigio
13fe238674
Add extra dollar in Makefile/image
...
Signed-off-by: Jose Bigio <jose.bigio@docker.com >
Upstream-commit: 65a9bb677ebffccb2d5d1002c3e1bdd4dd46d76c
Component: packaging
2018-08-07 13:22:53 -07:00
Jose Bigio
3570421f62
Remove shell directive so target will work
...
Signed-off-by: Jose Bigio <jose.bigio@docker.com >
Upstream-commit: 93fcc8443b504c94beaef697ec6f27748b40d656
Component: packaging
2018-08-07 13:21:18 -07:00
Jose Bigio
d72fa21d55
Add tar targets for engine image
...
Signed-off-by: Jose Bigio <jose.bigio@docker.com >
Upstream-commit: 2ffde00d61af1074e100ca0c725dbd4f685299a1
Component: packaging
2018-08-07 13:06:47 -07:00
Tibor Vass
9e965fad85
build: change --console=[auto,false,true] to --progress=[auto,plain,tty]
...
This changes the experimental --console flag to --progress following
feedback indicating avoidable confusion.
In addition to naming changes, the help output now has an additional
clarification, specifically: container output during builds are only
shown when progress output is set to plain. Not mentioning this was also
a big cause of confusion.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: faeb8bb571
Component: cli
2018-08-07 18:18:13 +00:00
docker-unir[bot]
0510b8b031
Merge pull request #133 from jose-bigio/fix_clean
...
Merged with https://github.com/seemethere/unir
Upstream-commit: 35f96bda01dd7df034a42f606f6aa46a7352e9fc
Component: packaging
2018-08-07 18:07:14 +00:00
Jose Bigio
5c8dc24b07
Don't delete the engine when cleaning
...
Signed-off-by: Jose Bigio <jose.bigio@docker.com >
Upstream-commit: 16e6737bf2976e83c4c140c95ae69d04905d150f
Component: packaging
2018-08-07 10:22:58 -07:00
GordonTheTurtle
5f75afe983
Merge branch 'master' of github.com:docker/docker-ce
2018-08-07 17:03:38 +00:00
GordonTheTurtle
53e0010b72
Merge component 'cli' from git@github.com:docker/cli master
2018-08-07 16:37:00 +00:00
GordonTheTurtle
ad843ef36b
Merge component 'cli' from git@github.com:docker/cli master
2018-08-07 16:32:36 +00:00
Sebastiaan van Stijn
d098202034
Merge pull request #1277 from vdemeester/template-subtests-followup
...
Migrate `TestExtractVariables` to subtests…
Upstream-commit: 1d04f7d66b
Component: cli
2018-08-07 16:30:11 +02:00
Vincent Demeester
68e01b8ab7
Migrate TestExtractVariables to subtests…
...
… as suggested in previous PR comment.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 9cd7c1361c
Component: cli
2018-08-07 16:06:13 +02:00
Ximo Guanter Gonzálbez
a18736f217
Fix #28814
...
Signed-off-by: Ximo Guanter Gonzálbez <joaquin.guantergonzalbez@telefonica.com >
Upstream-commit: ea65a0b1349b532e9d10d63835c751d291a7c0f4
Component: engine
2018-08-07 10:20:13 +02:00
Tibor Vass
a3a5617ab6
builder: fix compilation errors after vendoring
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: c53d7e71046581775a8888706c0fd6baddb81a0b
Component: engine
2018-08-07 06:03:10 +00:00
docker-unir[bot]
7133d76b99
Merge pull request #130 from dhiltgen/revamp_packages
...
Merged with https://github.com/seemethere/unir
Upstream-commit: a3231d16bd2b7f7a21f9686514617e76bb65cf41
Component: packaging
2018-08-06 18:28:39 +00:00
Derek McGowan
084e7423dc
libcontainerd: split client and supervisor
...
Adds a supervisor package for starting and monitoring containerd.
Separates grpc connection allowing access from daemon.
Signed-off-by: Derek McGowan <derek@mcgstyle.net >
Upstream-commit: dd2e19ebd58cd8896d79b4b8db61144b93717b33
Component: engine
2018-08-06 10:23:04 -07:00
docker-unir[bot]
426d022fb6
Merge pull request #129 from jose-bigio/build_manifest_images
...
Merged with https://github.com/seemethere/unir
Upstream-commit: 840f3a247d472ce692f1652da60d380613b0298f
Component: packaging
2018-08-06 16:51:23 +00:00
GordonTheTurtle
77d0975ce7
Merge component 'engine' from git@github.com:docker/engine master
2018-08-05 17:02:36 +00:00
Yong Tang
c811febb3c
Merge pull request #37586 from thaJeztah/bump_swarmkit
...
Bump SwarmKit to 8852e8840e30d69db0b39a4a3d6447362e17c64f
Upstream-commit: f57f260b49b6142366e6bc1274204ee0a1205945
Component: engine
2018-08-05 09:11:58 -07:00
GordonTheTurtle
7e95203d7f
Merge component 'engine' from git@github.com:docker/engine master
2018-08-04 01:01:42 +00:00
GordonTheTurtle
4706b6f33a
Merge component 'cli' from git@github.com:docker/cli master
2018-08-04 00:36:35 +00:00