unclejack
22b585e0fc
Merge pull request #7294 from erikh/fix_multiple_attach_test
...
Fix multiple attach test.
2014-08-28 13:38:28 +03:00
Victor Vieux
d9f8d3ea9f
Merge pull request #7461 from erikh/rewrite_dockerfile_parser
...
Cleanup: Refactor Dockerfile parser
2014-08-27 23:22:47 -07:00
Victor Vieux
a26fc6cae8
Merge pull request #7772 from LK4D4/log_dones
...
Add logDone logs where it's missing
2014-08-27 22:46:54 -07:00
Alexandr Morozov
3c984a6d15
Add logDone logs where it's missing
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-28 09:25:57 +04:00
Michael Crosby
334dca15b0
Merge pull request #7647 from ewindisch/erw-tarsum-maintainer
...
Add Eric Windisch to MAINTAINER for tarsum
2014-08-27 20:00:19 -07:00
Michael Crosby
2a5e29adc6
Merge pull request #7677 from erikh/update_hosts_linked_containers
...
Update /etc/hosts when linked container is restarted
2014-08-27 19:54:09 -07:00
Michael Crosby
77eefbc688
Merge pull request #7672 from cpuguy83/cleanup_volumes_from
...
Cleanup: applyVolumesFrom
2014-08-27 19:43:16 -07:00
Michael Crosby
345e3811fe
Merge pull request #7767 from vieux/move_some_tests
...
Move some tests
2014-08-27 19:28:31 -07:00
Erik Hollensbe
2ef1dec7e8
builder: Refactors according to @tiborvass's comments
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:52:30 -07:00
Erik Hollensbe
305f735080
builder: several fixups from comments
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:52:30 -07:00
Erik Hollensbe
a1522ec01c
builder: move the evaluator package code directly into builder
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:52:30 -07:00
Erik Hollensbe
cb51681a6d
builder: Fix handling of ENV references that reference themselves, plus tests.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:52:30 -07:00
Erik Hollensbe
1ae4c00a19
builder: fix references to jobs in daemon, make builder a first class
...
package referring to evaluator
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:52:30 -07:00
Erik Hollensbe
3dfe5ddfb9
builder: Remove spurious .gitignores
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:52:30 -07:00
Erik Hollensbe
248f4c4f75
builder/parser: Rewrite Parse() to use := instead of var
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:52:30 -07:00
Erik Hollensbe
135f54ccbf
builder: Remove blankNode(), use &Node{} instead.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:52:30 -07:00
Erik Hollensbe
21b15ac920
builder: handle certain classes of JSON errors gracefully
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:52:30 -07:00
Erik Hollensbe
4122a981ae
builder: negative test support, fix for shykes's broken dockerfile
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:52:30 -07:00
Erik Hollensbe
3f5f6b038f
builder: comments / documentation
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:52:30 -07:00
Erik Hollensbe
d6c0bbc3cb
builder: add command handling to evaluator.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:52:30 -07:00
Erik Hollensbe
bb36902db6
builder: rewrote NewBuildFile according to tibor's comments
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:52:29 -07:00
Erik Hollensbe
22c46af4b3
builder: parser and beginnings of the evaluator
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:52:29 -07:00
Fred Lifton
1c3b732f8a
Adding release notes to docs home
...
This is a temporary solution until we have a dedicated release notes page with automated content.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-08-27 18:34:19 -07:00
Erik Hollensbe
f6a2fc4c33
Update networking doc with clarified text regarding links usage
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:23:41 -07:00
Erik Hollensbe
9f09ef18a4
pkg/networkfs/etchosts: tests for Update method
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:23:41 -07:00
Erik Hollensbe
925a3254e7
pkg/graphdb: tests for Parents and Children
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-08-27 18:23:41 -07:00
Victor Vieux
450740c891
Update /etc/hosts when linked container is restarted
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-08-27 18:23:41 -07:00
Victor Vieux
2b538bd555
remove auth_test.go
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-08-28 00:28:54 +00:00
Victor Vieux
5b27fbc0e2
move TestEntrypoint & TestBindMounts
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-08-28 00:25:10 +00:00
Victor Vieux
96e1c99fb4
Merge pull request #7708 from SvenDowideit/programatic-usage-options
...
add the [OPTIONS] string automatically if there are flags defined
2014-08-27 16:40:17 -07:00
Victor Vieux
eb9379c5d0
move TestKillDifferentUser
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-08-27 23:34:37 +00:00
Sven Dowideit
7c27c7a096
Merge pull request #7766 from fredlf/update_b2d_upgrading
...
Updating B2D upgrade instructions for 1.2.0.
2014-08-27 15:53:48 -07:00
SvenDowideit
8c6c4a12b7
add the [OPTIONS] string automatically if there are flags defined
...
Signed-off-by: SvenDowideit <SvenDowideit@home.org.au >
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-08-28 08:50:50 +10:00
Victor Vieux
0cb672e6a9
Merge pull request #7762 from LK4D4/skip_delete_no_chain_#6904
...
Skip "no chain" error on deleting chain in Unmap
2014-08-27 14:43:57 -07:00
Fred Lifton
3304d4e984
Updating B2D upgrade instructions for 1.2.0.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-08-27 14:16:29 -07:00
Michael Crosby
e0db426ff6
Merge pull request #7764 from vieux/revert
...
Revert "--help option and help command should print to stdout not stderr"
2014-08-27 12:02:02 -07:00
Victor Vieux
2e489073d9
Revert "--help option and help command should print to stdout not stderr"
...
This reverts commit 61b129d818 .
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-08-27 18:59:13 +00:00
Hollie Teal
77ca0ae9de
Added Fred's suggestions.
...
Signed-off-by: Hollie Teal <hollie@docker.com >
2014-08-27 11:49:26 -07:00
Michael Crosby
835800fcd5
Merge pull request #7686 from guywithnose/trancateNames
...
Truncate the names list on ps
2014-08-27 11:46:28 -07:00
Robert Bittle
d2ffcd986f
Truncate the names list on ps
...
Signed-off-by: Robert Bittle <guywithnose@gmail.com >
2014-08-27 14:24:49 -04:00
Victor Vieux
76fd51a478
Merge pull request #6052 from rhatdan/help
...
--help option and help command should print to stdout not stderr
2014-08-27 11:17:16 -07:00
James Turnbull
7458a82e0b
Added Syntax highlighting file for the KDE Kate Editor
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-08-27 11:16:51 -07:00
Eric Windisch
0bd1c05e5c
Restrict repository names from matching hexadecimal strings
...
To avoid conflicting with layer IDs, repository names must
not be tagged with names that collide with hexadecimal strings.
Signed-off-by: Eric Windisch <eric@windisch.us >
2014-08-27 13:46:10 -04:00
Alexandr Morozov
bd049b3800
Skip "no chain" error on deleting chain in Unmap
...
Fixes #6904
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-08-27 20:24:27 +04:00
Michael Crosby
1385b2d293
Merge pull request #7740 from LK4D4/registry_style
...
Style fixes for registry/registry.go
2014-08-26 18:02:11 -07:00
Brian Goff
7495fbc0e3
Cleanup: applyVolumesFrom
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-08-26 20:52:58 -04:00
Dawn Chen
9cd77818bb
Bump containervm version to the latest one: 20140826
2014-08-26 16:59:21 -07:00
Hollie Teal
161cc21f24
Final changes.
...
Signed-off-by: Hollie Teal <hollie@docker.com >
2014-08-26 14:01:10 -07:00
James Turnbull
4fe6115fb1
Merge pull request #7741 from LK4D4/bump_docs_to_1.15
...
Bump docs and api to 1.15
2014-08-26 13:44:05 -07:00
James Turnbull
5b6c25f751
Merge pull request #7735 from SvenDowideit/lxcconf-api-docs
...
Lxcconf api docs
2014-08-26 13:43:48 -07:00