Граф коммитов

11045 Коммитов

Автор SHA1 Сообщение Дата
Alexandr Morozov fcfe80f633 Minor fix of tests names
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-14 11:47:01 -07:00
Alexandr Morozov fbaa41b5aa Add logDone for TestBuildAddSingleFileToNonExistDir
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-14 11:17:41 -07: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
Fred Lifton 3040c8b759 Merge pull request #8527 from SvenDowideit/dissalow-robots-except-for-docs.docker.com
start sending robots.txt (and humans.txt) again, and set to dissallow if...
2014-10-13 12:12:18 -07:00
Fred Lifton 6ce3967f8f Merge pull request #8517 from sequenceiq/master
docs: fixing docker.io api
2014-10-13 12:09:39 -07:00
Fred Lifton ce669297df Merge pull request #8503 from aanand/tlsverify-environment-variable
Add DOCKER_TLS_VERIFY environment variable, equivalent to --tlsverify flag
2014-10-13 10:20:10 -07:00
James Turnbull 42b217044a Merge pull request #8435 from SvenDowideit/explain-docker-attach-more
Add more info on attach inspired by discussion in #2855
2014-10-13 13:19:22 -04:00
James Turnbull e3101a3508 Merge pull request #8523 from duglin/FixLinkCmdLine
Fix href in docs w.r.t. cgroups freezer pointer
2014-10-13 13:18:49 -04:00
James Turnbull 8a32aa26c1 Merge pull request #8524 from duglin/Regardless
Fix typo: reguardless should be regardless
2014-10-13 13:18:21 -04:00
James Turnbull fe03da7da8 Merge pull request #8507 from duglin/Issue3087
Add some docs about which env vars are defined in new containers
2014-10-13 13:13:43 -04:00
Aanand Prasad 19fb942d36 Add DOCKER_TLS_VERIFY environment variable, equivalent to --tlsverify flag
This makes it possible to make the Docker client "secure by default"
without wrapping the binary in a shell alias so that `--tlsverify` is
always passed.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-10-13 11:49:26 +01:00
Sven Dowideit 801edfa9b8 Add more info on attach inspired by discussion in #2855
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-10-13 17:30:08 +10:00
Sven Dowideit 3d2f10e28a Mention the mkdocs.yml file for adding new documents
and move the complicated discussion about branches lower down,
hopefully most won't need to know

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-10-13 17:06:18 +10:00
Sven Dowideit 3732cd6612 README.md is a sub-section in how to build automated builds
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-10-13 17:00:58 +10:00
Sven Dowideit 687215c32f Turn off editing for auto-generated index pages, and scroll the user to the right section
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-10-13 16:32:18 +10:00
Sven Dowideit d883fb66b0 Hide the empty sidebad TOC on the search page
This uses @dnephin's changes to the base.html (thank you!)

and then adds the hide_toc: page meta

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-10-13 14:10:29 +10:00
Sven Dowideit 44e9a59665 start sending robots.txt (and humans.txt) again, and set to dissallow if its not the real docs site
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-10-13 13:53:16 +10:00
Doug Davis 61387427cb Add more info about the LINK env vars created
@SvenDowideit see what you think. I'd like to get your take on this
before I submit the PR.

Closes #4789

Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-10-12 18:34:18 -07:00
Doug Davis ba7038c8d2 Fix typo: reguardless should be regardless
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-10-12 14:41:24 -07:00
Doug Davis b10e11f30e Fix href in docs w.r.t. cgroups freezer pointer
Apparently, the [...] and (http...) need to be right after each other instead
of on different lines.

Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-10-12 12:59:46 -07:00
Lajos Papp 137bad4b48 docs: fixing docker.io api
Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com>
2014-10-12 09:05:58 +02:00
unclejack 7fa7c42ce2 Merge pull request #8508 from vbatts/vbatts-too_many_open_files
cleaner handling of client socket access
2014-10-11 11:16:23 +03:00
Jessie Frazelle 9f482a66ab Merge pull request #8393 from dmcgowan/provenance_pull_enhance
Make V2 code more defensive against malformed content
2014-10-10 17:19:59 -07:00
Victor Vieux 246ec5dd06 Merge pull request #8505 from crosbymichael/ps-name
Improve ps name parsing
2014-10-10 17:08:35 -07:00