Commit Graph
18626 Commits
Author SHA1 Message Date
Harald Albers 27422ef1df Fix bash completion when extglob is not set
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 0a5aac1ff6cbacfeefb34702b4726a4e189b1bb9
Component: engine
2015-09-16 18:17:40 +02:00
Brian Goff c99dd532dd Merge pull request #16309 from LK4D4/fix_volumes_race
volumes: add synchronization to Count and List
Upstream-commit: 7b1930063fcf6eda698ef93989a35657a0644cf5
Component: engine
2015-09-16 11:28:51 -04:00
Tim Waugh 0b8d66eb11 Add documentation note that LABEL allows environment replacement
Signed-off-by: Tim Waugh <twaugh@redhat.com>
Upstream-commit: ea4d70bdfd55ee2018674e5878031566e58b8fd1
Component: engine
2015-09-16 14:47:01 +01:00
Brian Goff 58d500daa7 Merge pull request #16314 from Microsoft/10662-stopsignal2
Windows: Turn off TestBuildStopSignal
Upstream-commit: e0fee019ca4a961149ea9bb6210ed5a4c8c5ab17
Component: engine
2015-09-16 09:42:01 -04:00
Shijiang Wei 267460c20b error should be checked earlier in the hijack function
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: f2d978ccf9ae29aa8ac06791ac0ffeceb4167d9b
Component: engine
2015-09-16 20:28:07 +08:00
Madhav Puri 2051b748c0 incorporate doc review comments
Signed-off-by: Madhav Puri <madhav.puri@gmail.com>
Upstream-commit: 8cfcd8738070f24bd66e3b7ed46c6459df3fa9a3
Component: engine
2015-09-16 03:31:15 -07:00
Madhav Puri ded3de600a Support for passing build-time variables in build context
- The build-time variables are passed as environment-context for command(s)
run as part of the RUN primitve. These variables are not persisted in environment of
intermediate and final images when passed as context for RUN. The build environment
is prepended to the intermediate continer's command string for aiding cache lookups.
It also helps with build traceability. But this also makes the feature less secure from
point of view of passing build time secrets.

- The build-time variables also get used to expand the symbols used in certain
Dockerfile primitves like ADD, COPY, USER etc, without an explicit prior definiton using a
ENV primitive. These variables get persisted in the intermediate and final images
whenever they are expanded.

- The build-time variables are only expanded or passed to the RUN primtive if they
are defined in Dockerfile using the ARG primitive or belong to list of built-in variables.
HTTP_PROXY, HTTPS_PROXY, http_proxy, https_proxy, FTP_PROXY and NO_PROXY are built-in
variables that needn't be explicitly defined in Dockerfile to use this feature.

Signed-off-by: Madhav Puri <madhav.puri@gmail.com>
Upstream-commit: 54240f8da9992880e20a1508e9a6f0e59f2adef1
Component: engine
2015-09-16 03:31:15 -07:00
Jessica Frazelle 0b5d2a0494 add opensuse to rpm builder
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: b0d4e9d1ba0dec9c43ae212ce10b509da9a05919
Component: engine
2015-09-15 16:18:19 -07:00
moxiegirl 3a894b4cd3 Merge pull request #16291 from mikebrow/readme-updates-for-man-pages
updates to readme documents for manual page
Upstream-commit: 606c6e8f57dd32b041364af019b681cf1d44669b
Component: engine
2015-09-15 15:18:19 -07:00
Jess Frazelle bf1f233fb1 Merge pull request #16324 from calavera/update_changelog
Update changelog for version 1.8.2.
Upstream-commit: be082715c7184df185bfde0acaccdbdf2460779d
Component: engine
2015-09-15 14:51:53 -07:00
David Calavera de4b1f5bc6 Update changelog for version 1.8.2.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3b7cdfcd6b7a1c22a8318afaac16e5328b56ff1f
Component: engine
2015-09-15 17:43:37 -04:00
Christian Rotzoll 8d4c894e27 Remove unused variable, fix #16310
Signed-off-by: Christian Rotzoll <ch.rotzoll@gmail.com>
Upstream-commit: 9c9b748ad8fefb059d0c6bf585593ae1b623cc51
Component: engine
2015-09-15 22:20:10 +02:00
Vincent Batts 5aa203fb95 Revert "Make events test more deterministic in go1.5"
This reverts commit 386aefb9fcf65f1a5f68fd61e5108ea0858d2d3f.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: fc77ea787e33864284c14ca743bf3ebc0f50c249
Component: engine
2015-09-15 15:55:18 -04:00
John Howard fa3b248d8f Windows: Turn off TestBuildStopSignal
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 6167c7bfb8431e5e83130fd44bd36d75da488b21
Component: engine
2015-09-15 11:56:54 -07:00
Vincent Batts 6bc65656e8 daemon/events: let Log be [slightly] blocking
With go1.5's concurrency, the use of a goroutine in Log'ing events was
causing the resulting events to not be in order.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 09e7dd03f8740d7865ea91c56a231ce9ae9bec82
Component: engine
2015-09-15 14:28:22 -04:00
Stefan J. Wernli 965c460a95 Windows: Fix long path handling for docker build
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
Upstream-commit: 9b648dfac6453de5944ee4bb749115d85a253a05
Component: engine
2015-09-15 10:58:11 -07:00
Alexander Morozov 8dd1931b2b volumes: add synchronization to Count and List
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 2d21996eec8d3e6100f19fa0d0fa7adad25285ca
Component: engine
2015-09-15 10:38:53 -07:00
Mike Brown 361f21e647 updates to readme documents for manual page
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
Upstream-commit: 96699e06dd05bef436c0b9e9df64f102c44e7329
Component: engine
2015-09-15 12:08:02 -05:00
Brian Goff 19987593e7 Merge pull request #16285 from calavera/cleanup_volumes_when_create_fails
Remove volume references when container creation fails.
Upstream-commit: 59311faaed4e3384fc8da738a57a25f17ae07e05
Component: engine
2015-09-15 10:55:51 -04:00
Antonio Murdaca 407bf841c2 graph: remove unused functions parameters
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 723f587b56b940ac5ea79e567b47da91270955b1
Component: engine
2015-09-15 15:34:15 +02:00
Brian Goff 700bfcfe4a Merge pull request #15069 from duglin/UseErrorPackage
Use the new error package
Upstream-commit: e91f2c26ce38787e159162d2c4a43744396e3308
Component: engine
2015-09-15 09:28:53 -04:00
Flavio Castelli 4f31f389b4 Update SUSE docs
Clarify some parts of the document, add extra resources link.

Signed-off-by: Flavio Castelli <fcastelli@suse.com>
Upstream-commit: 5d6bb52976456d35e3d3a725b8c93992b3e69f31
Component: engine
2015-09-15 14:46:46 +02:00
Antonio Murdaca 852d9066b4 Merge pull request #16275 from coolljt0725/fix_register_failed_and_start
Fix container register failed during daemon start and then start the container
Upstream-commit: db2ac8655d046b97b33636077faa420a700d8bfc
Component: engine
2015-09-15 11:46:03 +02:00
Antonio Murdaca 5562327b20 Merge pull request #16279 from coolljt0725/clean_up
Clean up: remove redundant value assign in runconfig/parse.go
Upstream-commit: 0d873f6e708913fcfa8ba2c6fcb57872cbaafbc9
Component: engine
2015-09-15 11:43:38 +02:00
Hu Keping c71aa53e3d Refactor the statistics of network in docker stats
For now docker stats will sum the rxbytes, txbytes, etc. of all
the interfaces.

It is OK for the output of CLI `docker stats` but not good for
the API response, especially when the container is in sereval
subnets.

It's better to leave these origianl data to user.

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: d3379946ec96fb6163cb8c4517d7d5a067045801
Component: engine
2015-09-15 15:40:34 +08:00
Sebastiaan van Stijn e0de6dc515 Merge pull request #16295 from BWITS/master
typo
Upstream-commit: 99b40d1e149157de06065c1cc92c23c2b07706ee
Component: engine
2015-09-15 08:42:04 +02:00
Phil Estes 36a12430ca Merge pull request #16282 from mavenugo/ln_uns
Vendor-in libnetwork 2baa2ddc78b42f011f55633282ac63a72e1b09c1
Upstream-commit: 370ca6e401b251085a33f50e842f6567d2e9924e
Component: engine
2015-09-14 22:18:50 -04:00
Bill W 826aca1e6d typo
Signed-off-by: Bill Wang <ozbillwang@gmail.com>
Upstream-commit: 386b7bc71b07ee2317266ba64c0d59642b4042ab
Component: engine
2015-09-15 11:58:20 +10:00
Jessica Frazelle c4c2af06ea cleanup vendoring of test deps
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 8ef7aaf885e593fdd847693a3ffe8ff276216d1d
Component: engine
2015-09-14 17:38:50 -07:00
Stephen Day 943e453907 Merge pull request #16197 from aaronlehmann/carry-15539
Carry #15539: Avoid redundant HEAD requests on push
Upstream-commit: 58d6919183f9e796b1d3462fa79ce30fc0b72082
Component: engine
2015-09-14 17:15:32 -07:00
Trevor Pounds b8f6767a06 Fix minor documentation typo.
Signed-off-by: Trevor Pounds <trevor.pounds@gmail.com>
Upstream-commit: 2eedaf0389f663c8768893cd333cdd6df9e194e2
Component: engine
2015-09-14 17:08:04 -07:00
Brian Goff 4af52a5987 Merge pull request #16283 from nalind/journald-not-nil
Remove unnecessary check for nil CString
Upstream-commit: a90ed92df0b55cea8d2cf64858db10aeacf6775c
Component: engine
2015-09-14 19:45:36 -04:00
David Calavera 1f4f6c3414 Merge pull request #15931 from vdemeester/api-client-ps-coverage
Add more unit tests on api/client/ps package
Upstream-commit: 7ce270d4ea17d5ec01fe00581fbabf4c5274f0e1
Component: engine
2015-09-14 14:02:49 -07:00
David Calavera ad942e9805 Merge pull request #16247 from calavera/unexport_volumedriver_interface
Unexport VolumeDriver.
Upstream-commit: bda964d0859157bb25d1579cbd3e45b005a072e7
Component: engine
2015-09-14 13:47:00 -07:00
David Calavera bfef76b67b Remove volume references when container creation fails.
Volumes are accounted when a container is created.
If the creation fails we should remove the reference from the counter.
Do not log ErrVolumeInUse as an error, having other volume references is
not an error.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 2c6c07752c8d89fa72249c24285ede1b4e579b24
Component: engine
2015-09-14 16:16:46 -04:00
David Calavera 1c2bc6c79f Merge pull request #16276 from Mashimiao/typo-fix-opts-split
opts/opts.go: fix typo
Upstream-commit: fedecb8c916bea9a737d992012133f05ccf7c954
Component: engine
2015-09-14 13:12:16 -07:00
Doug Davis bb8ff26c08 Use the new error package
This is the first step in converting out static strings into well-defined
error types.  This shows just a few examples of it to get a feel for how things
will look. Once we agree on the basic outline we can then work on converting
the rest of the code over.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 628b9a41b09fde3ce1493f7d4f1495b9afaa506c
Component: engine
2015-09-14 13:11:01 -07:00
Nalin Dahyabhai 7d3bcc0ea2 Remove unnecessary check for nil CString
@noxiouz points out that we don't need to check for a nil result from
C.CString(), since an out-of-memory condition causes a runtime panic
instead.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> (github: nalind)
Upstream-commit: 11fda783f85e1f6027c997c6b044c65288c89099
Component: engine
2015-09-14 14:16:48 -04:00
Derek McGowan 0dc44a70e4 Ignore ping errors in notary repository setup
Notary is capable of acting in offline mode, making use of cache TUF data.
When ping is not successful, notary should still be attempted without error.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 5e11cd43aa21a9d0eb1f5f205f05dc7b14ee4d43
Component: engine
2015-09-14 11:08:25 -07:00
Madhu Venugopal 7c0ce8d93c Vendor-in 2baa2ddc78b42f011f55633282ac63a72e1b09c1 for userns support
Changes include :
* libnetwork support for userns
* driver api change to have 1 interface per endpoint

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: d0e0c13b603efaff14c0269d19ac7e3710307fab
Component: engine
2015-09-14 11:04:12 -07:00
Sebastiaan van Stijn 03b8b15474 Merge pull request #16274 from opreaadrian/rest-api-documentation-syntax-error
Rest api documentation syntax error
Upstream-commit: 084f8060e28842fa6d23aa8b83ea357a2650cc41
Component: engine
2015-09-14 19:40:59 +02:00
David Calavera 6b4c313413 Merge pull request #15886 from xiekeyang/master
Fix: Docker Daemon didn't send actual actions client ask for to Token Server
Upstream-commit: d25dada639fe475ff6496b1d357d2250a0e014e3
Component: engine
2015-09-14 09:47:19 -07:00
Mike Brown 4343929089 rebased, the clean up of the first few paragraphs of getting started with containers; addressed nit
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
Upstream-commit: ff61be9b04e8e30900ac9338d7368667c97f1039
Component: engine
2015-09-14 09:26:32 -05:00
moxiegirl 203dc7867a Merge pull request #16253 from AmeBel/update-documentation-on-run
add a documentation note on backslash usage in shell form of RUN
Upstream-commit: 621143a6413dcc0cdd347cc91081e2865fe505fb
Component: engine
2015-09-14 06:32:20 -07:00
Lei Jitang 43cb20e54c Clean up: remove redundant value assign in runconfig/parse.go
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 5575b9367832b22a3103b697a2ef8ffaf0b95944
Component: engine
2015-09-14 08:30:11 -04:00
Amen Belayneh a212a2f525 update documentation styling as per suggestions
Signed-off-by: Amen Belayneh <amenbelayneh@gmail.com>
Upstream-commit: 30164588d6be5d5a07b079719f15cf2da06322d2
Component: engine
2015-09-14 19:08:27 +08:00
Adrian Oprea c88accb730 Fix typos in REST API documentation
Replace comma with column
Remove extra curly brace

Fix typo in REST API documentation

Replace comma with column in documentation.

Signed-off-by: Adrian Oprea <adrian@codesi.nz>

Remove extra curly brace

Remove extra curly brace from remote API docs.

Signed-off-by: Adrian Oprea <adrian@codesi.nz>
Upstream-commit: 18d856f55adfd37da5023867e9a63bbfe331dc01
Component: engine
2015-09-14 11:18:41 +03:00
Ma Shimiao 28aab5a3bf opts/opts.go: fix typo
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 185544a4fede739bfd85633f18bf71a6f3deafd9
Component: engine
2015-09-14 14:48:09 +08:00
Lei Jitang 2cfd978e65 Fix container register failed during daemon start and try to start the container
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: b4841dd2371cdab8ef6e01d8304622fdb3578644
Component: engine
2015-09-13 22:52:56 -04:00
Phil Estes 357f37d8f7 Merge pull request #16244 from calavera/libcontainer_0_0_4
Vendor libcontainer v0.0.4
Upstream-commit: dac92a8afbe0900641afa00e33e84e180d432239
Component: engine
2015-09-13 22:24:44 -04:00