Commit Graph
27195 Commits
Author SHA1 Message Date
John Howard f15a4c4a3e Windows: Ensure frozen cope with prefix
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b820ead42674eca25c9718fb4de924405ec0c555
Component: engine
2016-06-23 16:39:16 -07:00
Alexander Morozov f335a08e05 pkg/pools: avoid copy of sync.Pool
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: ba3af336eb0bd5bd6082b41bb4ce0ea542c3f008
Component: engine
2016-06-23 16:09:13 -07:00
Vincent Demeester 6af42f8c0d Merge pull request #23912 from dmcgowan/fix-overlay2-whiteout-exclusion
Fix overlay2 ignoring whiteout files
Upstream-commit: 37fe4bdb59cae499cefb0d8bce8c28b894cd6f98
Component: engine
2016-06-24 01:06:38 +02:00
Adam Avilla 852cc7fc30 Fixing typo on service log output.
Signed-off-by: Adam Avilla <aavilla@yp.com>
Upstream-commit: 7cc6fe575895dca6c50c4eadb0fd4c4986d05048
Component: engine
2016-06-23 14:54:40 -07:00
Derek McGowan 066b0582fe Fix overlay2 ignoring whiteout files
Currently when overlay creates a whiteout file then the overlay2 layer is archived,
the correct tar header will be created for the whiteout file, but the tar logic will then attempt to open the file causing a failure.
When tar encounters such failures the file is skipped and excluded for the archive, causing the whiteout to be ignored.
By skipping the copy of empty files, no open attempt will be made on whiteout files.

Fixes #23863

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: bd13c53f8dc1504c9e681dfabef2afc1685ccec7
Component: engine
2016-06-23 13:34:38 -07:00
Doug Davis 826b691215 Merge pull request #23760 from SerhatG/docker_doc_cmd_shell_comment
Docker reference error CMD with ENV variables
Upstream-commit: 86d5c7e759e099b2662770be82cf9248ab0df5ba
Component: engine
2016-06-23 13:34:14 -07:00
John Starks f8672a967c Windows: Always enable VT emulation
Always enable VT output emulation when starting the process so that
non-attaching commands can still output VT codes.

Also remove the version block for using the native console and just rely
on supported flags being present.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 4acc2c7499425b9c2521977019d9fe4da73e6af8
Component: engine
2016-06-23 13:14:39 -07:00
Sebastiaan van Stijn 7c1b9df9b0 Merge pull request #23853 from docker/linkchecker-updates
Removing some url links that can be resolved using src markdown links
Upstream-commit: 563973a183bc100e78688f3b5e7b2244c341700a
Component: engine
2016-06-23 12:34:45 -07:00
Sebastiaan van Stijn 47e88f8ceb Merge pull request #23857 from davidmichaelkarr/patch-1
Update work-with-networks.md: Fix Subnet and Gateway props to match command line
Upstream-commit: 6b3faf781f272c2e1f6922bcb35c9b627f323743
Component: engine
2016-06-23 12:25:02 -07:00
Tõnis Tiigi fbf0465b15 Merge pull request #23790 from tonistiigi/skip-pull
Skip always pulling images on integration tests
Upstream-commit: 487931902c1177352e4eceec1b5ef558a5ba24cc
Component: engine
2016-06-23 11:47:33 -07:00
Vincent Demeester 5c41618370 Merge pull request #23859 from aboch/vnd
Update check-config.sh, netlink and libnetwork vendoring
Upstream-commit: 18398b2933577d9704e69b0b8312b495e487eeb5
Component: engine
2016-06-23 20:34:02 +02:00
Sebastiaan van Stijn 3b1be8edbb Fix installation script for RHEL
the previous fix changed the lsb_dist variable
too early. We only normalize to "centos"
for the repository-location, so changing
it just before that.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 73d5f0648e430a74cd05ff9fd335611ddc6dd2a1
Component: engine
2016-06-23 11:17:55 -07:00
Vincent Demeester 14bdbbb927 Merge pull request #23896 from runcom/f24-contrib
contrib: builder: rpm: add Fedora 24
Upstream-commit: 4cad55026ac74915c45e1b6657910a5e269d3b1f
Component: engine
2016-06-23 20:08:35 +02:00
Vincent Demeester 7d0f5567de Merge pull request #23899 from orkaa/evalulate-rename
For the lulz! (evalulate -> evaluate)
Upstream-commit: 3c40f22d704741a50ba99c121b9c34c4eeda845f
Component: engine
2016-06-23 19:23:54 +02:00
Aaron Lehmann fed645b1f8 Merge pull request #23862 from LK4D4/fix_unused
all: fix usage of some variables
Upstream-commit: c9175a6deb70887afc757702a69bf750b9668fd4
Component: engine
2016-06-23 10:21:10 -07:00
orkaa 59b0cca4d4 For the lulz! (evalulate -> evaluate)
Signed-off-by: orkaa <orkica@gmail.com>
Upstream-commit: 1bdbfa57709586f9fa747c2323bc3cd3b03e90f0
Component: engine
2016-06-23 16:26:43 +02:00
Antonio Murdaca ef5445e5b7 contrib: builder: rpm: add Fedora 24
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 0b83f27328eab843d79c94dd603f52e8fb9c013b
Component: engine
2016-06-23 12:31:11 +02:00
Vincent Demeester cfb578f331 Merge pull request #23888 from sdurrheimer/zsh-completion-event-load-save
Add zsh completion for 'load' and 'save' image events
Upstream-commit: e3a698fcd08026a4ac88ce230d0ea4934003a0c6
Component: engine
2016-06-23 10:13:01 +02:00
Vincent Demeester b45b2ebcea Merge pull request #23890 from sdurrheimer/zsh-completion-link-local-ip
Add zsh completion for 'docker {create,run,network connect} --link-lo…
Upstream-commit: 28f4a8ca558a7cac3626c043958e46e252623092
Component: engine
2016-06-23 10:12:05 +02:00
Vincent Demeester d116aab7ed Merge pull request #23891 from sdurrheimer/zsh-completion-run-storage-opt
Add zsh completion for 'docker run --storage-opt size='
Upstream-commit: 6211570de1382867c2083e5bf2d7363354d44c2d
Component: engine
2016-06-23 10:11:02 +02:00
Vincent Demeester 3aab922488 Merge pull request #23892 from sdurrheimer/zsh-completion-cpu-shares-c
Re-Add zsh completion for '-c' alias to '--cpu-shares'
Upstream-commit: 29717dd34725ff71665235e3d9928d4642ef160b
Component: engine
2016-06-23 10:09:59 +02:00
Vincent Demeester e3836198d3 Merge pull request #23889 from sdurrheimer/zsh-completion-storage-driver-overlay2
Add zsh completion for 'docker daemon --storage-driver (overlay2|vfs)'
Upstream-commit: 9ebc423e164dd09f6335bc7cb6781015cb55877c
Component: engine
2016-06-23 10:08:38 +02:00
Steve Durrheimer aeeb26f5f9 Re-Add zsh completion for '-c' alias to '--cpu-shares'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 4c23ac0ae5103a1238c25cd1216507e9d6eec779
Component: engine
2016-06-23 08:57:39 +02:00
Steve Durrheimer ba1a95ea00 Add zsh completion for 'docker run --storage-opt size='
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 857e7d6ae4f78184c70b2047ed45b24a6732537d
Component: engine
2016-06-23 08:52:42 +02:00
Steve Durrheimer 541d0255f6 Add zsh completion for 'docker {create,run,network connect} --link-local-ip'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 704d9b6864cc81a1564f482a2dfbaa32b9c5e905
Component: engine
2016-06-23 08:44:08 +02:00
Steve Durrheimer 0911fc3a5d Add zsh completion for 'docker daemon --storage-driver (overlay2|vfs)'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 8e582a257326496cc27d30751b759a37f993d116
Component: engine
2016-06-23 08:35:36 +02:00
Steve Durrheimer 148092dc76 Add zsh completion for 'load' and 'save' image events
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: e2f1f699b39d30d71a9afc9af7027088970aa4fd
Component: engine
2016-06-23 08:29:24 +02:00
Anusha Ragunathan 89230aa7b1 Add plugin restore tests.
Also live restore is stable now. So move experimental tests out to stable.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 006d58d7e6756848058bd69a12c698c44e64efd1
Component: engine
2016-06-22 19:04:26 -07:00
Akihiro Suda a880fa14a9 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.
https://github.com/cpuguy83/go-md2man/commit/a8f937e11314ca0b085aa7a7a5526695e3ca5b49

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: cfe16e0d5b4bb7d1d194553f2a82cc1879d60e6b
Component: engine
2016-06-23 01:58:37 +00:00
Tonis Tiigi 9d859318a6 Fix error reporting on executor wait
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: c895a76f1076c782011e9decf58ab6548cf0fb35
Component: engine
2016-06-22 18:12:51 -07:00
Tonis Tiigi a185c1fb92 Do not show tasks from down nodes as active in ls
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 5d4401d6d72c647fa61501c40949b2d67c3f958b
Component: engine
2016-06-22 14:49:24 -07:00
Charles Smith 3194815e09 correct output description - only one task is running on manager
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 5f219806fce6c70bfea1a610476e7e3e6e78371d
Component: engine
2016-06-22 12:41:22 -07:00
Alexander Morozov ebb89af810 Merge pull request #23776 from Microsoft/ShutdownError
Windows: Prevent logging errors when shutting down an already shut down container
Upstream-commit: 138f9538f3a740ef56b1a6cd43ae537a78f4d896
Component: engine
2016-06-22 12:11:00 -07:00
Kenfe-Mickael Laventure 40dd500778 Use "docker-runc" as alias for the default runtime
This also moves the variable holding the default runtime name from the
engine-api repository into docker repository

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 69af7d0d13670b8e2a03a38b4d9a849fc109b338
Component: engine
2016-06-22 11:59:26 -07:00
Tõnis Tiigi c04403422d Merge pull request #23829 from LK4D4/cleanup_unused
api,daemon: cleanup some unused stuff
Upstream-commit: 506234e3f0f6d8f8a0629e09f38dfe96ada025c2
Component: engine
2016-06-22 11:58:57 -07:00
Alexander Morozov 266d9f9808 Merge pull request #23832 from tonistiigi/unify-swarm-init-update
Unify swarm init and update options
Upstream-commit: df6630f6a3c08548f355a255e18f01c9fcb0ad86
Component: engine
2016-06-22 11:56:07 -07:00
Alexander Morozov f6a8b95a82 Merge pull request #23835 from swernli/loggerfix
Fixing file handle leak for "docker logs"
Upstream-commit: 7eae48cd21f12a64c97c76f60412f32a2f1ade78
Component: engine
2016-06-22 11:52:55 -07:00
Harald Albers 24fc12c925 bash completion enhancements for docker {swarm,node,service}
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: e3339a75d3d9e79ed5b8d372237ce5d2802910ba
Component: engine
2016-06-22 20:23:46 +02:00
Yong Tang 82ca53bf58 Use spf13/cobra for docker update
This fix is part of the effort to convert commands to spf13/cobra #23211.

Thif fix coverted command `docker update` to use spf13/cobra

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 9765593c5f7cdd3ef16dbd0cae35bb68cf5542ef
Component: engine
2016-06-22 11:06:44 -07:00
Alessandro Boch d08991bd63 Add modules for secure overlay network to check-config.sh
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: c355e059cc1a4f66338a039240195c66dc928e73
Component: engine
2016-06-22 10:51:13 -07:00
Alexander Morozov 9e92fb5474 all: fix usage of some variables
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 57e14714ee85e67f59d8c22aed23dc875cf2e58c
Component: engine
2016-06-22 10:40:32 -07:00
David M. Karr (fullname at gmail.com) 7656eec977 Update work-with-networks.md
The value of the Subnet and Gateway properties didn't match the command-line argument.

Signed-off-by: David M. Karr <davidmichaelkarr@gmail.com>
Upstream-commit: a54c3fbb8aa024c477864a0614506da3ea185839
Component: engine
2016-06-22 09:48:59 -07:00
Alessandro Boch 0014a77b9b Vendoring libnetwork ed311d0
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: e26c513fa818a57b4ea572121e153cf6f056e1ee
Component: engine
2016-06-22 09:40:20 -07:00
Alessandro Boch 57899c6630 Vendoring vishvananda/netlink 734d02c
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 58b8b8fa1555223c1144f08fc4536ffaa4d12fd0
Component: engine
2016-06-22 09:37:17 -07:00
Sven Dowideit 9bfdf60ca3 Removing some url links that can be resolved using src markdown links
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 01f9cbc3663cf134ca427e4f8b98bba637f6655e
Component: engine
2016-06-22 12:50:51 +00:00
Vincent Demeester eee2bc634c Merge pull request #23846 from HackToday/fixdoc
Fix the missing 'ls'
Upstream-commit: b2da02dc7e4695dbe42efe25fab0684f3b846b30
Component: engine
2016-06-22 11:08:28 +02:00
Kai Qiang Wu(Kennan) 425fb8faf5 Fix the missing 'ls'
Signed-off-by: Kai Qiang Wu(Kennan) <wkq5325@gmail.com>
Upstream-commit: cbd240581f274c3599efb1c43b01cb61607c79d0
Component: engine
2016-06-22 08:40:35 +00:00
Tadej Janež 195618e60e Expand instructions on using systemd to manage containers
Signed-off-by: Tadej Janež <tadej.j@nez.si>
Upstream-commit: c8a99a5054b2f890d56eda15adf478d4e70612b1
Component: engine
2016-06-22 10:21:17 +02:00
Tadej Janež c94d00fa49 Use 'default.target' in systemd unit file example
Previously, 'local.target' was used which is not going to work
out-of-the-box for lots of users.
The 'default.target' is the default unit systemd starts at bootup and
hence what most users would be expected to use.

Signed-off-by: Tadej Janež <tadej.j@nez.si>
Upstream-commit: 0a8c46d5e5f9a8c66e6ab6ac5ce7f50143b9a8df
Component: engine
2016-06-22 10:13:13 +02:00
Sven Dowideit a2ad68a66b Merge pull request #23818 from shishir-a412ed/doc_fix_PR19367
Man page fix: Mention supported drivers for --storage-opt size option in docker create/run.
Upstream-commit: 937c0a16483147ebb9641bc7280a1bb813404ed0
Component: engine
2016-06-22 11:59:10 +10:00