Commit Graph
13775 Commits
Author SHA1 Message Date
Joseph Kern c16863b9b6 Modified docker export to allow an --output flag
Copied code from CmdSave into CmdExport. This should work, not an expert in the API calls being made. But it does make more sense to have a consistent export/save flag.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

checkpoint before edits on the export functions

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Added an --output flag to docker export and created tests.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

White space cleanup.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Docker-DCO-1.1-Signed-off-by: Joseph Kern <jkern@semafour.net> (github: jfrazelle)

checkpoint before edits on the export functions

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

White space cleanup.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Added text to reflect a new output option for the export command.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Whitespace clean up

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Added man page documentation for the new --output flag in export

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
Upstream-commit: 5ff122f79713f177c07dbc43bb81f991243472d5
Component: engine
2015-03-17 00:20:19 -07:00
Jessie Frazelle dfdd70de33 Merge pull request #11203 from rhatdan/Dockerfile
We had some testers who found a hard to diagnose bug in Dockerfile
Upstream-commit: f4f10cf43ba1298284dcab926b2594bafda1087a
Component: engine
2015-03-16 17:26:18 -07:00
Jessie Frazelle df4aae20f1 Merge pull request #10723 from SvenDowideit/takeover-10653
Update sample systemd for container
Upstream-commit: 44e9715e46db46d9c88b5bba6072c0fe42aa5837
Component: engine
2015-03-16 17:18:57 -07:00
Jessie Frazelle 1bcf6f53fe Merge pull request #10816 from SvenDowideit/docker-build-return-code
Add some information about the docker build return code
Upstream-commit: c7f5ee9d695f336ad2c273ceebdf2fe3257f673f
Component: engine
2015-03-16 17:18:26 -07:00
Jessie Frazelle 9596e6f457 Merge pull request #11353 from mrunalp/override_default_mounts
Filter out default mounts that are being overriden by the user.
Upstream-commit: 87a8658eb625d25d4d72bf65efc5629be4c99d40
Component: engine
2015-03-16 16:40:32 -07:00
Michael Crosby 2b824bffa5 Merge pull request #11332 from icecrime/windows_release
Publish Windows binaries in release script
Upstream-commit: 9422bc55fafbf0a084090398560ca4fcd6235919
Component: engine
2015-03-16 16:39:58 -07:00
Jessie Frazelle 1820b54f91 Merge pull request #11427 from LK4D4/fix_alloc_ip6
Fix IPv6 autoallocation from mac with --ipv6-cidr
Upstream-commit: 213be9ee2761828f56c7308bd85e4ca9fd33e34a
Component: engine
2015-03-16 16:38:46 -07:00
Phil Estes c470ea400e Merge pull request #11426 from dmcgowan/registry-error-cleanup
Quote registry error strings
Upstream-commit: d70c5cdcb90832a4b5e361d6fcaf374bcf3c135f
Component: engine
2015-03-16 19:27:41 -04:00
Michael Crosby c03919b68e Merge pull request #11411 from icecrime/contributing_squash
Detail CONTRIBUTING.md regarding squashing
Upstream-commit: c0b48ab70e0cc34a78e58a16871426f40a2fef72
Component: engine
2015-03-16 16:25:54 -07:00
Michael Crosby 7a404617a3 Merge pull request #11402 from miminar/err-cleanup
Error formatting cleanups
Upstream-commit: 88f437d6c619f7b07a22cb5750814bce4d8d7164
Component: engine
2015-03-16 16:13:16 -07:00
Michael Crosby 046de93bdf Merge pull request #11416 from mrunalp/update_libcontainer
Update libcontainer to 52a8c004ca94cf98f6866536de828c71eb42d1ec
Upstream-commit: 8a6a5929a3164fb3fd6a6bc017d738763ff60ce7
Component: engine
2015-03-16 15:51:58 -07:00
Arnaud Porterie 16dea9ca51 Publish Windows binaries in release script
Windows client being official supported, publish Docker client Windows
binaries as part of the release.sh script.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 241c37197643a2495adbca8985c6399dba52a370
Component: engine
2015-03-16 15:49:38 -07:00
Mrunal Patel 9b00b0ac0c Filter out default mounts that are override by user.
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Upstream-commit: 7804cd36eec45c184dcabdbcb52033c1c0179c03
Component: engine
2015-03-16 18:39:50 -04:00
Alexander Morozov aeed74c156 Fix IPv6 autoallocation from mac with --ipv6-cidr
We used slice globalIPv6Network.IP itself, not its copy as expected.

Fixes #10774

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 491f8ab14493babb1c06e240c7a9de64f34827a0
Component: engine
2015-03-16 15:36:50 -07:00
Derek McGowan 272713f665 Quote registry error strings
Currently when registry error strings contain new line characters only the last line is displayed to the client. Quote the string to ensure the client can see the entire body value.

fixes #11346

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 33c94eb23857f23fb91899b77ba8615c4e6bdadf
Component: engine
2015-03-16 15:32:47 -07:00
Michael Crosby bd0b1983fb Merge pull request #11343 from hqhq/hq_fix_panic_error
fix panic error when docker stats a stopped container
Upstream-commit: a2fcae41efdc52087d733d962b9ee3ef37a81450
Component: engine
2015-03-16 15:16:03 -07:00
Mrunal Patel ca91611c4f Update libcontainer to 52a8c004ca94cf98f6866536de828c71eb42d1ec
It includes fixes to selinux Getfilecon, mounting sysfs and cgroups.

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Upstream-commit: 591f821aee9e1d59ec3c619e15344c90047463d6
Component: engine
2015-03-16 18:13:40 -04:00
Arnaud Porterie f07bd027b7 Define 'logical unit of work'
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 68a9cd63cc4ca3c898388fe814a2dd8b7fca385e
Component: engine
2015-03-16 15:09:40 -07:00
Jessie Frazelle afaf27b603 Merge pull request #11424 from dmcgowan/registry-ping-user-agent
Use request factory for registry ping
Upstream-commit: 9611b6470843c2ec616978e14bc73e9e27260c0f
Component: engine
2015-03-16 15:02:53 -07:00
Jessie Frazelle f6d69b904a Merge pull request #11420 from estesp/reexec-path-fix
Fix relative path execution of docker daemon in reexec.Self()
Upstream-commit: f41ba82eb97379948aa88eb80eefd7a96c37e1ec
Component: engine
2015-03-16 14:57:25 -07:00
Tibor Vass 526e8c6e31 Merge pull request #10591 from duglin/ErrUnknownCmd
Generate an error on unknown Dockerfile instruction
Upstream-commit: 085054db9d8850a7d2c8658bb9a7fdacf7a3ceb8
Component: engine
2015-03-16 17:47:28 -04:00
Phil Estes 194d87a1e1 Merge pull request #10792 from larsks/bug/10781
fix various problems with iptables.Exists
Upstream-commit: 1705ded1d208673ebd1a5fcc61a324da5f30411d
Component: engine
2015-03-16 17:39:36 -04:00
Jessie Frazelle eda2d7f6c9 Merge pull request #11419 from dmcgowan/fix-test-pull-verified
Fix test pull verified
Upstream-commit: 2550c306eb737c75f331454fa372bc5700b566f4
Component: engine
2015-03-16 14:23:59 -07:00
Derek McGowan 1fae595274 Use request factory for registry ping
Currently when the registry ping is sent, it creates the request directly from http.NewRequest instead of from the http request factory. The request factory adds useful header information such as user agent which is needed by the registry.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 55f0ca94e57fc8ec26a79061d04ddd3aeaecb94b
Component: engine
2015-03-16 14:21:00 -07:00
Michael Crosby 00d90da424 Merge pull request #11295 from LK4D4/oom_after_dead
Check oom status after container stopped in lxc driver
Upstream-commit: 0c2eb5ebfb118e1fcab84a8eb70dc8aee5a618ad
Component: engine
2015-03-16 14:16:47 -07:00
Lars Kellogg-Stedman 2781401caa fix various problems with iptables.Exists
This modifies iptables.Exists so that it must be called with an explicit
table and chain.  This allows us (a) to generate an appropriate command
line for "iptables -C", which was not previously possible, and (b) it
allows us to limit our strings.Contains() search to just the table and
chain in question, preventing erroneous matches against unrelated rules.

Resolves #10781

Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com>
Upstream-commit: 3559b4177e611920d87c4dae607c641efb645783
Component: engine
2015-03-16 17:14:45 -04:00
Jessie Frazelle a3cbef74ae Merge pull request #11364 from Mashimiao/update-manpage
Update docker manpage
Upstream-commit: 61e7efeadd3af1d9cf666866940d999ae7fd450b
Component: engine
2015-03-16 14:13:27 -07:00
Michael Crosby 1902f8ca99 Merge pull request #11300 from Microsoft/10662_jjh_server_factor_serverfd_and_systemd_for_windows
Factor out ServeFD & systemd in server for Linux only (Not Windows)
Upstream-commit: 66bf7a269a29c1058384727ec852024198a5db77
Component: engine
2015-03-16 14:12:48 -07:00
Phil Estes 7741ef02eb Fix relative path execution of docker daemon in reexec.Self()
After the new libcontainer API, the reexec.Self() output of the daemon
binary is used as the libcontainer factory InitPath.  If it is relative,
it can't be found at container start time.  This patch solves the
problem by making sure that we return a rooted/absolute path if a
relative path is used.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 334aea3441d9e499b7f999098a16abcb81d16a68
Component: engine
2015-03-16 16:52:00 -04:00
Tianon Gravi acb7ebba38 Enforce our use of the explicitly frozen images
This requires that any environment where we wish to run the integration-cli tests includes both the `Dockerfile` and `curl`, which has been deemed an appropriate and acceptable trade-off.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 793ebba3d6c7882897125116cd22ade87c6f37a6
Component: engine
2015-03-16 14:42:59 -06:00
Alexander Morozov 2479608ad5 Merge pull request #10977 from robertabbott/10959-progressreader
Moves progressreader from utils to its own package
Upstream-commit: 8ae20d8eba127361bc07260580e2d3b8e3628c3e
Component: engine
2015-03-16 12:45:33 -07:00
Derek McGowan f32b25fee3 Fix test pull verified
Update pull code to consider any layer download or new tag as an update.
Update hello-world frozen image to be explicitly tagged as frozen, to not interfere with pull tests.  The hello-world is used by pull tests because of its small size and there is no other official image with such a size.

fixes #11383

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 636037c3637eb1d09cc469cebe39ffb915bb0aa9
Component: engine
2015-03-16 12:22:00 -07:00
Alexander Morozov f923b4fab0 Merge pull request #11323 from delftswa2014/utils-daemon-windows
Make utils_daemon and volumes.go cross-platform compileable (Windows).
Upstream-commit: 6485d885a061a49b0f8d7aa27ec44afcccf56a98
Component: engine
2015-03-16 12:14:30 -07:00
Jessie Frazelle 7e91e1c6c8 Merge pull request #11403 from sapphiredev/typo
Fix minor typo
Upstream-commit: ed435fb458d71757e561ee267e0954f17c06559c
Component: engine
2015-03-16 10:17:14 -07:00
Qiang Huang 45269e9133 fix panic error when docker stats a stopped container
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 8dc5791f7302aea0734a26dc1f54d96b04771b8f
Component: engine
2015-03-16 19:55:34 +08:00
Michal Minar c29e43cc4b Format error by value
- Use `%v` verb to format errors.
- Give `param` constant in portallocator some better name.

Signed-off-by: Michal Minar <miminar@redhat.com>
Upstream-commit: 210ab030bc3dab7bcf8f7252f2f9facb5a26cb6b
Component: engine
2015-03-16 12:05:53 +01:00
sapphiredev 914df48348 Fix minor typo
Signed-off-by: sapphiredev <se.imas.kr@gmail.com>
Upstream-commit: 4b0744b1191622722c0cd24e9b4d46286e5e9c79
Component: engine
2015-03-16 19:50:52 +09:00
Rik Nijessen b06c1f22f7 Make utils_daemon and volumes cross-platform compileable.
Signed-off-by: Rik Nijessen <riknijessen@gmail.com>
Upstream-commit: 1ec2eac50db2c98e00a488664625a22bf3757066
Component: engine
2015-03-16 11:46:07 +01:00
Sven Dowideit 58b612822c Merge pull request #11393 from enguerran/patch-1
Ambiguous example in registry_mirror.md
Upstream-commit: 88924993a29c2997809471b802f046549b7f0d18
Component: engine
2015-03-16 16:21:00 +10:00
Arnaud Porterie b3678f8418 Merge pull request #11076 from hqhq/hq_use_warning_in_sysinfo
use type WARN for warning
Upstream-commit: 82f390e139e611b97911c19dd1be2a98264cf4b9
Component: engine
2015-03-15 21:13:23 -07:00
Arnaud Porterie ed5523443d Merge pull request #10298 from hqhq/hq_move_resource_to_hostconfig
move resource options from Config to hostConfig
Upstream-commit: bc7d1d6ef307b05b0951f5c884620a87c5ac8f7d
Component: engine
2015-03-15 17:30:46 -07:00
moxiegirl 8af0df8590 Merge pull request #11392 from moxiegirl/copy-edit-contribute
Adding in minor copy edits
Upstream-commit: a9e19a26724ca784be2b135bb690923e672913c0
Component: engine
2015-03-15 08:02:58 -07:00
Enguerran 3e5ae00db7 Update registry_mirror.md
The syntactic coloration is a little bit ambiguous, I suggest this as a fix.

Signed-off-by: Enguerran Colson <engcolson@gmail.com>
Upstream-commit: 0cd857d99f3b57db7db9f8668f57fb1788a7ae01
Component: engine
2015-03-15 12:35:43 +01:00
Mary Anthony 206ad49d5c Adding in minor copy edits
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: dc899c4eaf1261ba0d5a740271bba0bfc866ae3c
Component: engine
2015-03-14 21:31:36 -07:00
James Turnbull 8f90223a50 Merge pull request #11321 from duglin/CmdLineTweak
Add "Docker" to Reference pull-down for Command Line
Upstream-commit: 495f5e4998d5d6d4eb2115a196cb33ae7716ab9b
Component: engine
2015-03-14 21:04:25 -06:00
moxiegirl a7edb719ca Merge pull request #11297 from moxiegirl/11235-tweak-doc
Consistency in the restart policy docs
Upstream-commit: 2830b6fa584216b9e6aabe71d57bf04b8879a485
Component: engine
2015-03-14 19:58:46 -07:00
Jessie Frazelle aa2660197d Merge pull request #11389 from aidanhs/aphs-allow-nonexistent-gid-fix
Correctly check that gid parses as an int
Upstream-commit: e0cb65b4a9e0f420bdc7cb9b41d2174e6144392b
Component: engine
2015-03-14 16:12:35 -07:00
Aidan Hobson Sayers 9bd1fc5995 Correctly check that gid parses as an int
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: 8ef79ae8e42ae020a373712bd7d08bcb81e3fa97
Component: engine
2015-03-14 23:02:53 +00:00
Jessie Frazelle 0390507a59 Merge pull request #11377 from aidanhs/aphs-allow-nonexistent-gid
Allow a non-existent groupid to own the docker socket
Upstream-commit: 649d8333ce0c662eafa69784a87bd1a2f72599f7
Component: engine
2015-03-14 15:01:10 -07:00
Doug Davis 0a3eeb1d23 Generate an error on unknown Dockerfile instruction
Instead of just printing a warning and going on, this will generate
an error and stop processing.

This used to be part of #10561 but I decided it might need its own
independent discussion/PR as to not derail #10561.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 8a5b50d65dae2d0607e046c57241dd6b46b65c6a
Component: engine
2015-03-13 16:08:34 -07:00