Sven Dowideit
df8dbfa45d
Override prettyPrint's colour choice (red) for strings in quotes.
...
I've moved the docs.css to last so it can tweak any existing css, and
then set that to the same grey colour used for 'normal' text.
While testing I found and fixed an over-zealous line wrap.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-09-12 11:10:07 +10:00
Michael Crosby
32b5d145fa
Merge pull request #7963 from jfrazelle/7845-remove-image-fail-dont-untag
...
Failing to remove an image, will not remove the image name/tag.
2014-09-11 18:06:18 -07:00
Sven Dowideit
990da301cf
Merge pull request #7988 from markotibold/patch-1
...
Fixed a typo
2014-09-12 10:41:12 +10:00
Sven Dowideit
c0783dfceb
Merge pull request #7991 from laktek/master
...
Fixed a typo in docs (outpu -> output).
2014-09-12 10:40:16 +10:00
Sven Dowideit
6941931daa
Merge pull request #8000 from estesp/7985-networkport-doc-changes
...
Match docs to actual port range used in code.
2014-09-12 10:18:03 +10:00
Michael Crosby
d9c7c1a7da
Merge pull request #7957 from bfirsh/consistent-help-messages
...
Consistent help messages
2014-09-11 15:25:28 -07:00
Michael Crosby
98e409172c
Merge pull request #7996 from estesp/7943-validate-tagnames
...
Validate tag names similar to repository name validation; add tests
2014-09-11 15:19:50 -07:00
Jessie Frazelle
2d4e43b26b
Merge pull request #7959 from crosbymichael/update-libcontainer-sep6
...
Update libcontainer to 84ad9386a0240acb7475429a835
2014-09-11 14:59:24 -07:00
Phil Estes
46eb4140c9
Validate tag names similar to repository name validation; add tests
...
Addresses #7943
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2014-09-11 17:52:36 -04:00
Phil Estes
d6f4b2ebb4
Match docs to actual port range used in code.
...
Addresses #7985
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2014-09-11 17:20:01 -04:00
Jessica Frazelle
b2efdc538d
Removing an image that fails, also removes the image name/tag.
...
Fixes #7845 and #7801 , and a real pain point I had :)
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-09-11 11:29:25 -07:00
Michael Crosby
ed7fb3bbda
Merge pull request #7202 from timbot/add-registry-mirror-flag
...
Add daemon flag to specify public registry mirrors
2014-09-11 11:11:01 -07:00
Michael Crosby
08f1a91ccd
Merge pull request #7806 from erikh/fix_cmd_handling_in_parser
...
Fix cmd and entrypoint handling in parser
2014-09-11 10:42:22 -07:00
Jessie Frazelle
e550fc532c
Merge pull request #7984 from vbatts/vbatts-engine_env_comments
...
engine.Env: comments and tests for Get()
2014-09-11 10:19:58 -07:00
Erik Hollensbe
91bed43621
builder: Fix an error check being done at the wrong spot in run
...
dispatcher
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-11 06:00:24 -07:00
Erik Hollensbe
576416c99a
move entrypoint integration-cli test for blank entrypoint to separate function
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-11 06:00:24 -07:00
Erik Hollensbe
92f885d7bd
Do not populate path to prevent runconfig merge conflict; remove
...
autoConfig seeding of entrypoint.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-11 06:00:24 -07:00
Erik Hollensbe
78a847a47a
evaluator: ensure entrypoint stays blank if set blank while CMD is set.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-11 06:00:24 -07:00
Erik Hollensbe
ac107995ae
builder: Fix entrypoint and cmd semantics in evaluator. Test c/o @cnf
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-11 06:00:24 -07:00
Erik Hollensbe
3a6d1228a8
builder: Fix a small bug that could improperly cache.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-11 06:00:24 -07:00
Erik Hollensbe
6b322ad2d3
builder/parser: fix handling of empty strings as the only argument.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-11 06:00:24 -07:00
Erik Hollensbe
234f0e4f79
builder/parser/dumper: Handle newlines appropriately.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-11 06:00:24 -07:00
Lakshan Perera
7b1fdd6c04
Fixed a typo in docs (outpu -> output).
...
Signed-off-by: Lakshan Perera <lakshan@laktek.com>
2014-09-11 09:09:59 +00:00
Marko Tibold
ef3920278e
Fixed typo
2014-09-11 08:55:45 +02:00
Vincent Batts
6e0bc06018
engine.Env: comments and tests for Get()
...
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2014-09-10 22:20:49 -04:00
Sven Dowideit
2d1c8bd786
Merge pull request #7975 from passy/patch-2
...
Fix link for configuring automated builds
2014-09-11 09:16:41 +10:00
Michael Crosby
48fe9c1082
Merge pull request #7689 from vbatts/vbatts-tarsum_versioning
...
TarSum: versioning
2014-09-10 15:08:36 -07:00
Vincent Batts
747f89cd32
TarSum: versioning
...
This introduces Versions for TarSum checksums.
Fixes: https://github.com/docker/docker/issues/7526
It preserves current functionality and abstracts the interface for
future flexibility of hashing algorithms. As a POC, the VersionDev
Tarsum does not include the mtime in the checksum calculation, and would
solve https://github.com/docker/docker/issues/7387 though this is not a
settled Version is subject to change until a version number is assigned.
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2014-09-10 15:41:52 -04:00
Pascal Hartig
ecbc8de249
Fix link for configuring automated builds
2014-09-10 21:08:05 +02:00
Michael Crosby
25f7840993
Merge pull request #7955 from LK4D4/ignore_delete_err_on_unmap_#7954
...
Deallocate port before trying to delete iptables chain
2014-09-09 17:41:26 -07:00
Michael Crosby
f9c345ddfa
Merge pull request #7897 from LK4D4/refactoring_net_mode
...
Add IsPrivate method for NetworkMode
2014-09-09 14:20:59 -07:00
Alexandr Morozov
080ca86191
Add IsPrivate method for NetworkMode
...
This method indicates that container using private network stack
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-09-10 00:46:43 +04:00
Alexandr Morozov
2e7cf6b0ce
Deallocate port before trying to delete iptables chain
...
Fixes #7954
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-09-10 00:40:46 +04:00
Vincent Batts
197f9b1e2b
Merge pull request #7921 from unclejack/increase_tarsum_buffer_size
...
pkg/tarsum: make buffer size dynamic
2014-09-09 16:10:02 -04:00
Tim Smith
69a75c673c
Add daemon flag to specify public registry mirrors
...
Adds support for a --registry-mirror=scheme://<host>[:port]
daemon flag. The flag may be present multiple times. If
provided, mirrors are prepended to the list of endpoints used
for image pull. Note that only mirrors of the public
index.docker.io registry are supported, and image/tag resolution
is still performed via the official index.
Docker-DCO-1.1-Signed-off-by: Tim Smith <timbot@google.com> (github: timbot)
2014-09-09 19:03:38 +00:00
Michael Crosby
b5a4c70455
Merge pull request #7960 from vbatts/vbatts-tarsum_debugf_not_infof
...
tarsum: use Debugf, not Infof
2014-09-09 11:51:36 -07:00
Jessie Frazelle
2a832f617b
Merge pull request #7948 from SvenDowideit/add-more-port-specification-doc
...
add -p PORT as a valid format specification
2014-09-09 11:43:25 -07:00
Jessie Frazelle
971240696f
Merge pull request #7660 from rhatdan/selinux-volumes
...
Change default label of container volumes to shared SELinux Label
2014-09-09 11:16:19 -07:00
Vincent Batts
6a8cae3e03
tarsum: use Debugf, not Infof
...
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2014-09-09 14:07:20 -04:00
Michael Crosby
c604dc292e
Update libcontainer to 84ad9386a0240acb7475429a835
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-09-09 11:05:58 -07:00
Jessie Frazelle
49c32189c0
Merge pull request #7958 from dqminh/fix-lxc-template-console
...
fix console attribute in lxc template
2014-09-09 11:00:48 -07:00
Daniel, Dao Quang Minh
4b3b54ca38
fix console attribute in lxc template
...
commit 4aa5da278f
moves `Console` from Command to
ProcessConfig, but missed the change in lxc_template. Therefore creating a
container with tty using lxc driver with fail with error
template: lxc:60:20: executing "lxc" at <.Console>: Console is not a field of
struct type struct { *execdriver.Command; AppArmor bool; ProcessLabel string; MountLabel string }
This changes lxc_console template to refers to `.ProcessConfig.Console`
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
2014-09-09 13:51:13 -04:00
Ben Firshman
fec81690cc
Consolidate documentation for -H option
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-09-09 10:12:03 -07:00
James Turnbull
1ed467a9ae
Merge pull request #7953 from SvenDowideit/reformat-api-docs
...
Reformat the API docs so I can read them
2014-09-09 12:52:26 -04:00
Jessie Frazelle
17314e2fe8
Merge pull request #7951 from taohu/typo
...
typo fix: immediatly -> immediately
2014-09-09 09:44:51 -07:00
Dan Walsh
73617e5e18
Change default label of container volumes to shared SELinux Label
...
Since these will be shared between containers we want to label
them as svirt_sandbox_file_t:s0. That will allow multiple containers
to write to them.
Currently we are allowing container domains to read/write all content in
/var/lib/docker because of container volumes. This is a big security hole
in our SELinux story.
This patch will allow us to tighten up the security of docker containers.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2014-09-09 08:18:20 -04:00
Sven Dowideit
f36dfbdcaf
Reformat the API docs so I can read them
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-09-09 16:17:38 +10:00
Hu Tao
fcc7ec8073
typo fix: immediatly -> immediately
...
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
2014-09-09 01:16:19 -04:00
Fred Lifton
f1095b801e
Merge pull request #7949 from SvenDowideit/remove-doubled-up-page-heading
...
Make the side bar about in-document navigation by removing the duplicated h1
2014-09-08 20:50:06 -07:00
Sven Dowideit
1f25bfea2d
Make the side bar about in-document navigation by removing the duplicated h1
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-09-09 11:44:51 +10:00