30806ebc0f
Merge branch 'release' into merge_release_v1.3.0
2014-10-16 17:22:27 +00:00
c78b920e01
Merge pull request #8323 from crosbymichael/bump_v1.3.0
...
Bump to version 1.3.0
2014-10-16 10:08:54 -07:00
d040de6dd4
Fix more missing HOME references
...
Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-10-16 10:14:26 -06:00
f6140060e3
Fix commit api document
...
The commit message field should be `comment`, not `m`
https://github.com/docker/docker/blob/master/api/server/server.go#L478
Signed-off-by: Huayi Zhang <irachex@gmail.com>
2014-10-16 18:10:58 +08:00
2eb9c0bfd4
Merge pull request #8595 from fredlf/signed-image-doco
...
Expanded release notes
2014-10-15 23:20:14 -07:00
7a062b2b8f
Avoid fallback to SSL protocols < TLS1.0
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
2014-10-15 22:39:51 -04:00
74d0485885
Expanded release notes
...
Made it clear signed images is a preview feature and added a little more info about how the feature works.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2014-10-15 16:08:07 -07:00
c78088fe3d
Bump to version 1.3.0
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-10-15 19:15:24 +00:00
87bd2da5d8
Merge branch 'master' into bump_v1.3.0
2014-10-15 19:15:13 +00:00
9a82713772
Merge pull request #8578 from erikh/fix_slash
...
builder: Handle trailing \ appropriately.
2014-10-15 12:11:37 -07:00
abec82bdee
Merge pull request #8579 from erikh/builder_html_panic
...
builder: handle anything we cannot parse the command for as a fatal error
2014-10-15 12:01:52 -07:00
73792969e6
Merge pull request #8582 from SvenDowideit/api-docs-link-to-basics-page
...
The basics page moved, update link.
2014-10-15 11:34:25 -07:00
3f2eb353bd
builder: provide a friendly message on parser errors
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-10-15 18:08:23 +00:00
9c6346e9b2
Merge pull request #8583 from SvenDowideit/minimal-curl-command-to-tls-docker-socket
...
Add a little info on how to talk to the TLS encrypted Docker Socket
2014-10-15 11:01:05 -07:00
de5b1b8bb0
Merge pull request #8580 from erikh/filter_comments_first
...
builder: strip blank lines before processing any line continuations.
2014-10-15 11:00:31 -07:00
63637b9d27
builder: handle anything we cannot parse the command for as a fatal error.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-10-15 08:47:15 +00:00
96f342f703
builder: comments should also be elided in the middle of statements following a line continuation.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-10-15 08:44:14 +00:00
1c68de798f
Add a little info on how to talk to the TLS encrypted Docker Socket
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-10-15 17:24:53 +10:00
a64ff0bf7a
The basics page moved, update link.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-10-15 16:48:43 +10:00
a1ef2207dd
builder: strip blank lines before processing any line continuations.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-10-15 04:00:17 +00:00
7fa449191c
builder: Handle trailing \ appropriately.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-10-15 03:08:18 +00:00
fcfe80f633
Minor fix of tests names
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-14 11:47:01 -07:00
fbaa41b5aa
Add logDone for TestBuildAddSingleFileToNonExistDir
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-14 11:17:41 -07:00
949ab47710
Replace '%s' in test utils
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-14 10:59:38 -07:00
c091397d51
Replace '%s' in run tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-14 10:59:19 -07:00
be31a66b7a
Replace '%s' in rm tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-14 10:59:11 -07:00
a44296603f
Replace '%s' in diff tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-14 10:59:01 -07:00
91f33fcaaa
Replace '%s' in create tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-14 10:58:35 -07:00
dc243c812b
Merge pull request #8564 from tiborvass/remove-docker-dot-io
...
change docs.docker.io to docs.docker.com in install script
2014-10-14 10:53:10 -07:00
e5e0baa6d4
change docs.docker.io to docs.docker.com in install script
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-10-14 13:45:26 -04:00
a29837020b
Merge pull request #8563 from crosbymichael/remove-key-create
...
Remove client key.json generation for trust
2014-10-14 10:45:15 -07:00
712e8da885
Remove client key.json generation for trust
...
This removes the key generation for trust from main while it is not
being consumed. The problem is that because this is being set in main
if a user runs as root initially the files will be owned by root. Later
if the user sets up the docker group they are unable to read the keys.
This is half a user error and documentation problem and the other half
is management.
We decided to remove this code for now while it is not being used and
will revisit it later when the consuming features are added. A few
options are to generate lazily and provide a clear error message on an
EPERM so that the user knows what is wrong and can correct the
permissions.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-10-14 17:16:45 +00:00
ba311ee58a
Fix support for --env-file in bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de>
2014-10-14 17:45:29 +02:00
23be0486f6
Merge pull request #8558 from fgrehm/patch-4
...
docs: Fix some minor typos on dockerlinks guide
2014-10-14 10:01:45 -04:00
06d633e1f6
docs: Fix some minor typos on dockerlinks guide
...
Signed-off-by: Fabio Rehm <fgrehm@gmail.com>
2014-10-14 10:15:35 -03:00
95b67895c4
Merge pull request #8553 from tianon/fix-over-aggressive-shell-interpolation-regex
...
Fix builder from being over-aggressive on ${}
2014-10-14 00:30:03 -07:00
24189b2c36
Fix builder from being over-aggressive on ${}
...
`${SOME_VAR%pattern}` was turning into `SOME_VAL%pattern}` which the shell would then balk at.
I've updated the `TOKEN_ENV_INTERPOLATION` regex to account for this (ie, if `${` is used, it _must_ also match the closing `}`), and renamed the variable to not be exported (since it's not used outside the function following it).
I also added comments for the bits of `tokenEnvInterpolation` so they're easier to follow. 😄
Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-10-14 00:58:55 -06:00
0ab2f19278
Merge pull request #8552 from crosbymichael/update-libcontainer-oct2
...
Update to libcontainer 8d1d0ba38a7348c5cfdc05aea3b
2014-10-13 23:43:06 -07:00
018ce19b31
Update to libcontainer 8d1d0ba38a7348c5cfdc05aea3b
...
This fixes issues where the apparmor profile is not applied to processes
via docker exec. As a side effect the parent processes were unable to
kill the additional child processes because of the profile mismatch.
Easy way to reproduce on an apparmor system:
docker run -ti debian:jessie bash
ps auxZ
- look at the labels
- in another shell
docker exec <name> sleep 1000
- go back to the first container and
ps auxZ
- make sure all processes have the correct docker-default profile
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-10-14 06:24:38 +00:00
ae4689f14d
add BytesSize in pkg/units
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-10-14 03:54:32 +00:00
9d1c9a4075
Merge pull request #8548 from crosbymichael/config-path
...
Write s3cfg to $HOME
2014-10-13 20:45:16 -07:00
e0a1df8e68
Write s3cfg to $HOME
...
Because of the base image change, $HOME is not always / and we need to
write to the proper $HOME within the container to complete the release
process.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-10-14 03:34:24 +00:00
e4976b8cc1
Merge pull request #8545 from fredlf/1.3release-notes
...
Adding release notes for 1.3.
2014-10-13 19:30:33 -07:00
2c5ad1ac3e
Merge pull request #8547 from erikh/onbuild-cmd
...
builder: ONBUILD triggers were not accurately being executed in JSON cases
2014-10-13 19:29:16 -07:00
18b507c49e
Merge pull request #8226 from SvenDowideit/more-daemon-option-information
...
More daemon option information
2014-10-14 12:06:14 +10:00
5bcff59feb
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
...
Add some information about the storage and execution driver choices
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-10-14 12:05:09 +10:00
1150c1639a
builder: ONBUILD triggers were not accurately being executed in JSON cases.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-10-14 01:59:45 +00:00
587e2f1ddc
Merge pull request #8529 from SvenDowideit/update-version-dropdown-on-404
...
Remove version selector and edit on Github on search page, as it only se...
2014-10-14 11:55:12 +10:00
5bf3ac5738
Remove version selector and edit on Github on search page, as it only searches the latest docs
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-10-14 11:54:41 +10:00
6b285c4cd6
Move registry search API docs into the registry API document.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-10-14 11:53:10 +10:00
Michael Crosby
Michael Crosby
Tianon Gravi
Huayi Zhang
Sven Dowideit
Daniel, Dao Quang Minh
Fred Lifton
Alexandr Morozov
Erik Hollensbe
Sven Dowideit
Alexandr Morozov
Jessica Frazelle
Tibor Vass
Harald Albers
James Turnbull
Fabio Rehm
Victor Vieux
Victor Vieux
SvenDowideit