Sebastiaan van Stijn
7a2669f596
Merge pull request #17610 from thaJeztah/add-env-example
...
Add examples for ENV vars in API
2015-11-06 01:19:58 +01:00
Sven Dowideit
a1ecd8e68c
Merge pull request #17693 from tophj-ibm/fixed-docs-contribution-link
...
Fixed link to contribution page in docs/README.md.
2015-11-06 09:57:07 +10:00
Nathan LeClaire
34f818527d
Merge pull request #2181 from dmp42/14-lint-harder
...
Lint, second pass
2015-11-05 15:25:10 -08:00
Solomon Hykes
2519f46550
Merge pull request #17700 from calavera/remove_lxc
...
Remove LXC support.
2015-11-05 15:22:37 -08:00
Daniel Nephin
ec22d98377
Use VolumeSpec instead of re-parsing the volume string.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-11-05 18:11:56 -05:00
Daniel Nephin
0e19c92e82
Make working_dir consistent in the config package.
...
- make it a positional arg, since it's required
- make it the first argument for all functions that require it
- remove an unnecessary one-line function that was only called in one place
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-11-05 18:11:56 -05:00
David Calavera
98ec6bc14c
Merge pull request #16692 from vdemeester/16690-fix-etc-osrelease-panic
...
Fix panic in parsing /etc/os-release
2015-11-05 15:11:02 -08:00
David Calavera
b232362310
Merge pull request #17735 from LK4D4/errcode_resize
...
Move errcode handling for resize upper
2015-11-05 15:00:48 -08:00
Daniel Nephin
3456002aef
Don't set the hostname to the service name with networking.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-11-05 17:50:32 -05:00
French Ben
16fa660e35
Added pull count to images - Fixes #1175
...
Signed-off-by: French Ben <me+git@frenchben.com >
2015-11-05 14:49:24 -08:00
John Howard
9c765040a5
Windows: Fix docker login
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-11-05 14:19:48 -08:00
David Calavera
157b66ad39
Remove exec-driver global daemon option.
...
Each platform has only a driver now.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-11-05 17:09:58 -05:00
David Calavera
3b5fac462d
Remove LXC support.
...
The LXC driver was deprecated in Docker 1.8.
Following the deprecation rules, we can remove a deprecated feature
after two major releases. LXC won't be supported anymore starting on Docker 1.10.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-11-05 17:09:57 -05:00
Tianon Gravi
6417c53c5a
Merge pull request #17731 from PerfectMemory/upstart-start-on-filesystem
...
Update upstart init script to start on filesystem (not only on local ones).
2015-11-05 13:51:07 -08:00
Jess Frazelle
31fa27d47e
Merge pull request #17496 from chasebolt/centos-rpm-dep
...
setting device-mapper-libs version dependency for centos 7 rpm
2015-11-05 13:46:27 -08:00
Olivier Gambier
436e85c150
Merge pull request #2191 from jviide/patch-1
...
Fix the local development environment instructions
2015-11-05 13:43:02 -08:00
Alexander Morozov
bb0e7eb196
Move errcode handling for resize upper
...
It'll allow to separate daemon layer more cleanly later.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-11-05 13:42:33 -08:00
Olivier Gambier
d2ada6488c
Lint
...
Signed-off-by: Olivier Gambier <olivier@docker.com >
2015-11-05 13:34:07 -08:00
David Calavera
b52bedbd48
Merge pull request #17726 from runcom/fix-errors-format
...
Fix errors format
2015-11-05 13:30:57 -08:00
Brian Goff
8de3d630ad
Merge pull request #17678 from asbjornenge/tm_syntax_updates
...
Added ARG instruction and aligned with src repo
2015-11-05 16:30:19 -05:00
David Calavera
c7b65288e4
Merge pull request #17685 from WeiZhang555/cluster-parser
...
Fix `--cluster-store` option parser
2015-11-05 13:21:52 -08:00
jviide
4b6455d395
Fix the local development environment instructions
...
Omit the docker-machine/ path prefix from the last cd command. Having followed the instructions the user should already be in the docker-machine directory.
Signed-off-by: Joachim Viide <jviide@iki.fi >
2015-11-05 23:21:45 +02:00
Brian Goff
9465d6ee6a
Merge pull request #17534 from Microsoft/10662-filterhyperv
...
Windows: Add isolation to ps filter
2015-11-05 15:55:47 -05:00
Daniel Nephin
d32bb8efee
Fix #1549 - flush after each line of logs.
...
Includes some refactoring of log_printer_test to support checking for flush(), and so that each test calls the unit-under-test directly, instead of through a helper function.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-11-05 15:33:42 -05:00
Stefan J. Wernli
37ba67bf63
Fixing last access time on Windows to unblock python.
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
2015-11-05 12:15:18 -08:00
Julien Pervillé
6f83dd22a3
Update upstart init script to start on filesystem (not only on local ones).
...
Signed-off-by: Julien Pervillé <julien.perville@perfect-memory.com >
2015-11-05 20:38:52 +01:00
Jess Frazelle
3c6962f22d
Merge pull request #17677 from fboudra/master
...
Remove yum cache to reduce image size
2015-11-05 11:16:40 -08:00
Vincent Demeester
7b102dc114
Fix panic in parsing /etc/os-release
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-11-05 19:59:29 +01:00
Vincent Demeester
b09a452c1f
Vendor mattn/go-shellwords
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-11-05 19:59:28 +01:00
Jess Frazelle
5353ccb05c
Merge pull request #17273 from stefanberger/apparmor_policy_1.9
...
More Rules for AppArmor
2015-11-05 10:52:43 -08:00
Olivier Gambier
24da8ad7a8
Merge pull request #2185 from dgageot/2171-fix-flags
...
FIX #2171 issue with amazonec2-private-address-only
2015-11-05 10:36:32 -08:00
John Howard
9c5814171c
Windows: Add isolation to ps filter
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-11-05 10:18:24 -08:00
French Ben
7c3ad48210
Merge pull request #1180 from FrenchBen/1158-tags
...
Added larger set for org and user repo - fixes 1158
2015-11-05 09:58:11 -08:00
David Gageot
11922080a1
FIX #2171 Fix faulty flag and add tests for SetConfigFromFlags
...
Signed-off-by: David Gageot <david@gageot.net >
2015-11-05 18:57:03 +01:00
Daniel Nephin
26c7dd3712
Handle non-utf8 unicode without raising an error.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-11-05 12:56:36 -05:00
David Gageot
d07e4e259a
Merge pull request #2184 from legal90/fix-integration-tests
...
test/integration: Remove machine forcibly, without stopping
2015-11-05 18:29:56 +01:00
Antonio Murdaca
77826333fe
Fix errors format
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
2015-11-05 18:17:37 +01:00
Sebastiaan van Stijn
336dea3e50
Merge pull request #17725 from polonskiy/patch-1
...
fix typo
2015-11-05 17:40:45 +01:00
Anton Polonskiy
3f331eaa40
fix typo
...
Signed-off-by: Anton Polonskiy <anton.polonskiy@gmail.com >
2015-11-05 18:33:16 +02:00
Stefan Berger
02411987ff
More Rules for AppArmor
...
This patch addresses the following AppArmor complains:
type=AVC msg=audit(1445537397.873:547): apparmor="ALLOWED" operation="mount"
info="failed srcname match" error=-13 profile="/usr/bin/docker"
name="/.pivot_root602836504/" pid=11512 comm="exe" flags="rw, rprivate"
type=AVC msg=audit(1445537265.325:502): apparmor="ALLOWED"
operation="file_lock" profile="/usr/bin/docker"
name="/var/lib/docker/network/files/local-kv.db" pid=9574 comm="docker"
requested_mask="k" denied_mask="k" fsuid=0 ouid=0
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com >
2015-11-05 11:06:18 -05:00
Aanand Prasad
67dc90ec0e
Merge pull request #2314 from dnephin/fix_up_require_build_error
...
Fix `up` "requires build" error
2015-11-05 15:52:56 +00:00
Aanand Prasad
97dee9d54a
Merge pull request #2310 from dnephin/update_release_notes
...
Update release notes
2015-11-05 15:52:41 +00:00
Daniel Nephin
8ff960afd1
Fix service recreate when image changes to build.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-11-05 10:27:11 -05:00
Daniel Nephin
ce322047a0
Move config hash tests to service_test.py
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-11-05 10:27:11 -05:00
Daniel Nephin
0227b3adbd
Upgrade pyyaml to 3.11
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-11-05 10:26:54 -05:00
Daniel Nephin
d18ad4c812
Fix rebase-bump-commit script when used with a final release.
...
Previously it would find commits for RC releases, which broke the rebase.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-11-05 10:25:46 -05:00
Daniel Nephin
6b002fb922
Cherry-pick release notes froim 1.5.0
...
And bump version to 1.6.0dev
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-11-05 10:25:46 -05:00
Vincent Demeester
c05e1b7d57
Merge pull request #17722 from jeroenj/patch-1
...
Fixes typo in docs/userguide/dockervolumes.md
2015-11-05 16:22:32 +01:00
Christopher Jones
f48f850a24
Updated link to https.
...
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
2015-11-05 09:20:20 -06:00
Jeroen Jacobs
75602d4930
Fixes typo in docs/userguide/dockervolumes.md
...
Signed-off-by: Jeroen Jacobs <git@jeroenj.be >
2015-11-05 16:08:11 +01:00