0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
11066 commits 14 branches 412 tags 338 MiB
Commit graph

11066 commits

This branch
This branch
All branches
Author SHA1 Message Date
Erik Hollensbe
cf23053eb1 builder: fix escaping for ENV variables. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-20 16:53:37 -04:00
Daniel, Dao Quang Minh
8caacb18f8 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)

Conflicts:
	registry/registry.go
 2014-10-20 16:51:06 -04:00
Tianon Gravi
7d9ccc2636 Fix more missing HOME references 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
 2014-10-20 16:51:06 -04:00
Jessica Frazelle
ada9ac7b13 Setting iptables=false should propagate to ip-masq=false 
Signed-off-by: Jessica Frazelle <jess@docker.com>
 2014-10-20 16:51:06 -04:00
Tibor Vass
e134f1f74a Do not verify certificate when using --insecure-registry on an HTTPS registry 
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	registry/registry.go
	registry/registry_test.go
	registry/service.go
	registry/session.go
 2014-10-20 16:51:06 -04:00
Michael Crosby
f43e77fc12 Don't hard code true for auth job 
Signed-off-by: Michael Crosby <michael@docker.com>

Conflicts:
	registry/service.go
 2014-10-20 16:51:05 -04:00
Michael Crosby
c66196a9dc Expand documentation for --insecure-registries 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-10-20 16:51:05 -04:00
Michael Crosby
c0598aced0 Refactor IsSecure change 
Fix issue with restoring the tag store and setting static configuration
from the daemon. i.e. the field on the TagStore struct must be made
internal or the json.Unmarshal in restore will overwrite the insecure
registries to be an empty struct.

Signed-off-by: Michael Crosby <michael@docker.com>

Conflicts:
	graph/pull.go
	graph/push.go
	graph/tags.go
 2014-10-20 16:51:05 -04:00
unclejack
f9b4bfa59b make http usage for registry explicit 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)

Conflicts:
	daemon/config.go
	daemon/daemon.go
	graph/pull.go
	graph/push.go
	graph/tags.go
	registry/registry.go
	registry/service.go
 2014-10-20 16:51:05 -04:00
Michael Crosby
c78088fe3d Bump to version 1.3.0 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-10-15 19:15:24 +00:00
Michael Crosby
87bd2da5d8 Merge branch 'master' into bump_v1.3.0 2014-10-15 19:15:13 +00:00
Michael Crosby
9a82713772 Merge pull request #8578 from erikh/fix_slash 
builder: Handle trailing \ appropriately.
 2014-10-15 12:11:37 -07:00
Alexandr Morozov
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
Fred Lifton
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
Erik Hollensbe
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
Fred Lifton
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
Alexandr Morozov
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
Erik Hollensbe
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
Erik Hollensbe
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
Sven Dowideit
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
Sven Dowideit
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
Erik Hollensbe
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
Erik Hollensbe
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
Michael Crosby
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
Tibor Vass
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
Michael Crosby
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
Michael Crosby
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
James Turnbull
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
Fabio Rehm
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
Victor Vieux
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
Tianon Gravi
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
Victor Vieux
0ab2f19278 Merge pull request #8552 from crosbymichael/update-libcontainer-oct2 
Update to libcontainer 8d1d0ba38a7348c5cfdc05aea3b
 2014-10-13 23:43:06 -07:00
Michael Crosby
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
Michael Crosby
9d1c9a4075 Merge pull request #8548 from crosbymichael/config-path 
Write s3cfg to $HOME
 2014-10-13 20:45:16 -07:00
Michael Crosby
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
Michael Crosby
e4976b8cc1 Merge pull request #8545 from fredlf/1.3release-notes 
Adding release notes for 1.3.
 2014-10-13 19:30:33 -07:00
Michael Crosby
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
Sven Dowideit
18b507c49e Merge pull request #8226 from SvenDowideit/more-daemon-option-information 
More daemon option information
 2014-10-14 12:06:14 +10:00
SvenDowideit
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
Erik Hollensbe
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
Sven Dowideit
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
Sven Dowideit
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
Sven Dowideit
9d5e3a54a0 Merge pull request #8525 from duglin/Issue4789 
Add more info about the LINK env vars created
 2014-10-14 11:24:17 +10:00
Fred Lifton
30cfa148b9 Adding release notes for 1.3. 
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
 2014-10-13 17:17:41 -07:00
Tibor Vass
839660ada1 Merge pull request #8541 from crosbymichael/update-libcontainer-oct1 
Update libcontainer to 4f409628d80b9842004a3f17c92
 2014-10-13 17:54:27 -04:00
Fred Lifton
939227a81a Merge pull request #8462 from SvenDowideit/document-how-to-add-a-new-document 
Mention the mkdocs.yml file for adding new documents
 2014-10-13 13:15:00 -07:00
Fred Lifton
c2096d7096 Merge pull request #8530 from SvenDowideit/auto-scroll-to-auto-index-section-the-user-requested 
Turn off editing for auto-generated index pages, and scroll the user to the right section
 2014-10-13 13:12:05 -07:00
Fred Lifton
66b9694b58 Merge pull request #8532 from SvenDowideit/demote-readme.md-header 
README.md is a sub-section in how to build automated builds
 2014-10-13 13:02:41 -07:00
Michael Crosby
8fedf718ce Update libcontainer to 4f409628d80b9842004a3f17c92 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-10-13 19:53:20 +00:00
Fred Lifton
547c42d8d0 Merge pull request #8528 from SvenDowideit/hide-side-toc-for-search 
Hide the empty sidebar TOC on the search page
 2014-10-13 12:13:06 -07:00