docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-23 15:21:32 +03:00
Code Activity
11,069 Commits 12 Branches 297 Tags
da21283cdbef0bd0ed0116bfed179ef9f837c858
Commit Graph

11069 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
da21283cdb Merge pull request #8612 from jfrazelle/8611-ip-masq-iptables 
Setting iptables=false should propagate to ip-masq=false
Upstream-commit: d1aca045b3970a862f6bfb0b8106e9266b66f88c
Component: engine
 2014-10-16 13:35:37 -07:00
Michael Crosby
9110a950dd Merge pull request #8606 from tianon/release-home 
Fix more missing HOME references
Upstream-commit: 40a6461d16f9fc4111e9c9a844447d0a7170ce41
Component: engine
 2014-10-16 12:12:38 -07:00
Michael Crosby
85566d62c3 Merge pull request #8608 from crosbymichael/merge_release_v1.3.0 
Merge release v1.3.0
Upstream-commit: c3237cc9d8356be505e29f22967aa84ea0c939d0
Component: engine
 2014-10-16 12:12:21 -07:00
James Turnbull
d6ca289754 Merge pull request #8609 from gesellix/patch-2 
fix minor docs error
Upstream-commit: 3d0d2fd183cbe3b95982aaf0d0c62d29961d927f
Component: engine
 2014-10-16 15:06:00 -04:00
Jessica Frazelle
47427bd007 Setting iptables=false should propagate to ip-masq=false 
Signed-off-by: Jessica Frazelle <jess@docker.com>
Upstream-commit: 3893e220e840054dfdadba637372bc30f683fe58
Component: engine
 2014-10-16 11:52:14 -07:00
Tobias Gesellchen
dace4f710e fix minor docs error 
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
Upstream-commit: 143f438e6e7a4c8205af59ba6e9f52cb450f1cce
Component: engine
 2014-10-16 19:36:36 +02:00
Michael Crosby
ad45324600 Change version to 1.3.0-dev 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: db21b556ceb365895b84628a2e75c61672d3adef
Component: engine
 2014-10-16 17:22:42 +00:00
Michael Crosby
711cbcb6e5 Merge branch 'release' into merge_release_v1.3.0 
Upstream-commit: 30806ebc0fbd91725eaf19d22903571f955d6a1b
Component: engine
 2014-10-16 17:22:27 +00:00
Michael Crosby
eda4d7b0de Merge pull request #8323 from crosbymichael/bump_v1.3.0 
Bump to version 1.3.0
Upstream-commit: c78b920e01c5d050105cd702fec46a4cc3b0d1f8
Component: engine
 2014-10-16 10:08:54 -07:00
Tianon Gravi
966c634d3c Fix more missing HOME references 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: d040de6dd4660041dd37792a9a702cf8317a71d9
Component: engine
 2014-10-16 10:14:26 -06:00
Sven Dowideit
453a4cc3b3 Merge pull request #8595 from fredlf/signed-image-doco 
Expanded release notes
Upstream-commit: 2eb9c0bfd457665840b1bc5b80cc5a967c1ede5d
Component: engine
 2014-10-15 23:20:14 -07:00
Fred Lifton
7a37e6bf0d 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)
Upstream-commit: 74d0485885cbb0e5f7561bd31399e5c13209d8d6
Component: engine
 2014-10-15 16:08:07 -07:00
Michael Crosby
1051381a0b Bump to version 1.3.0 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: c78088fe3d1b90640c637d8c3457de3caa0c7a24
Component: engine
 2014-10-15 19:15:24 +00:00
Michael Crosby
d0f2bc8dd1 Merge branch 'master' into bump_v1.3.0 
Upstream-commit: 87bd2da5d8030a3a1909784e4f2ab1f258e8278a
Component: engine
 2014-10-15 19:15:13 +00:00
Michael Crosby
d86ec1998c Merge pull request #8578 from erikh/fix_slash 
builder: Handle trailing \ appropriately.
Upstream-commit: 9a827137725d13dbe14c577df40dc35d061152b3
Component: engine
 2014-10-15 12:11:37 -07:00
Alexandr Morozov
33fccf1f63 Merge pull request #8579 from erikh/builder_html_panic 
builder: handle anything we cannot parse the command for as a fatal error
Upstream-commit: abec82bdeee84cef603561ae29fed45e45130a7c
Component: engine
 2014-10-15 12:01:52 -07:00
Fred Lifton
b0a547e200 Merge pull request #8582 from SvenDowideit/api-docs-link-to-basics-page 
The basics page moved, update link.
Upstream-commit: 73792969e62bed273dc8aca609d513e80856807a
Component: engine
 2014-10-15 11:34:25 -07:00
Erik Hollensbe
7e0088079e builder: provide a friendly message on parser errors 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 3f2eb353bdbb36ce26690909bcf761d4289294d6
Component: engine
 2014-10-15 18:08:23 +00:00
Fred Lifton
8a33177d4b 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
Upstream-commit: 9c6346e9b2be615ef93ef50cf24550c8afbe4e39
Component: engine
 2014-10-15 11:01:05 -07:00
Alexandr Morozov
5406659093 Merge pull request #8580 from erikh/filter_comments_first 
builder: strip blank lines before processing any line continuations.
Upstream-commit: de5b1b8bb01cfd9352b4e3127c4a19db22e85d46
Component: engine
 2014-10-15 11:00:31 -07:00
Erik Hollensbe
4a6aadc8cd 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)
Upstream-commit: 63637b9d277d322a06f24e3195fab48bc2a705d6
Component: engine
 2014-10-15 08:47:15 +00:00
Erik Hollensbe
ac6df7dc24 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)
Upstream-commit: 96f342f7030c3955900f8f2ddf06b0d36b1d993c
Component: engine
 2014-10-15 08:44:14 +00:00
Sven Dowideit
eb924a4c12 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)
Upstream-commit: 1c68de798fdebba5eefa1c66a79e946c7bb06fb5
Component: engine
 2014-10-15 17:24:53 +10:00
Sven Dowideit
256f3dd5a2 The basics page moved, update link. 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: a64ff0bf7a8c69e5698dc7e757d4ac56dd91b738
Component: engine
 2014-10-15 16:48:43 +10:00
Erik Hollensbe
8a73cf85f8 builder: strip blank lines before processing any line continuations. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: a1ef2207dd1f63a4104cfbf7927931174f5438a5
Component: engine
 2014-10-15 04:00:17 +00:00
Erik Hollensbe
61f914763d builder: Handle trailing \ appropriately. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 7fa449191ce9abc3e0a5261b66d8338948f66940
Component: engine
 2014-10-15 03:08:18 +00:00
Michael Crosby
f5ae3b0b1b Merge pull request #8564 from tiborvass/remove-docker-dot-io 
change docs.docker.io to docs.docker.com in install script
Upstream-commit: dc243c812b7f5584bb5c1d0008839e4bdf0152c0
Component: engine
 2014-10-14 10:53:10 -07:00
Tibor Vass
80f48778b2 change docs.docker.io to docs.docker.com in install script 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: e5e0baa6d4651dd0182413f0db622ab82e53841f
Component: engine
 2014-10-14 13:45:26 -04:00
Michael Crosby
acd86543a1 Merge pull request #8563 from crosbymichael/remove-key-create 
Remove client key.json generation for trust
Upstream-commit: a29837020b02d94ea6065116e0b60c3290c5d40f
Component: engine
 2014-10-14 10:45:15 -07:00
Michael Crosby
17a695568c 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>
Upstream-commit: 712e8da885de00d1957a15c0c7f862fb3b2f6beb
Component: engine
 2014-10-14 17:16:45 +00:00
James Turnbull
ebdafcc5e4 Merge pull request #8558 from fgrehm/patch-4 
docs: Fix some minor typos on dockerlinks guide
Upstream-commit: 23be0486f64adf6fbe5cdd13f7277e67d64b4339
Component: engine
 2014-10-14 10:01:45 -04:00
Fabio Rehm
7dca5b65c4 docs: Fix some minor typos on dockerlinks guide 
Signed-off-by: Fabio Rehm <fgrehm@gmail.com>
Upstream-commit: 06d633e1f68d003f6183403b134142b12a24c9ca
Component: engine
 2014-10-14 10:15:35 -03:00
Victor Vieux
0873f2636a Merge pull request #8553 from tianon/fix-over-aggressive-shell-interpolation-regex 
Fix builder from being over-aggressive on ${}
Upstream-commit: 95b67895c4a5bfa604cf850d202ecb2b4a7f3f14
Component: engine
 2014-10-14 00:30:03 -07:00
Tianon Gravi
872f82a3de 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>
Upstream-commit: 24189b2c36985f8345691fa6ec2c0766cfc133a7
Component: engine
 2014-10-14 00:58:55 -06:00
Victor Vieux
5db028b7e6 Merge pull request #8552 from crosbymichael/update-libcontainer-oct2 
Update to libcontainer 8d1d0ba38a7348c5cfdc05aea3b
Upstream-commit: 0ab2f192786c0e630229f6fd888f8acc546160af
Component: engine
 2014-10-13 23:43:06 -07:00
Michael Crosby
39417f76ad 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>
Upstream-commit: 018ce19b31bbd8d752658835e9442fa7d59a47e3
Component: engine
 2014-10-14 06:24:38 +00:00
Michael Crosby
81e510d938 Merge pull request #8548 from crosbymichael/config-path 
Write s3cfg to $HOME
Upstream-commit: 9d1c9a4075306e5d1e753a836913ef119d85934f
Component: engine
 2014-10-13 20:45:16 -07:00
Michael Crosby
e0af0724d0 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>
Upstream-commit: e0a1df8e683879bb999623a9521b272aafcc4208
Component: engine
 2014-10-14 03:34:24 +00:00
Michael Crosby
a2d7f3b3c1 Merge pull request #8545 from fredlf/1.3release-notes 
Adding release notes for 1.3.
Upstream-commit: e4976b8cc1236730ed52fc4e798f1be836364c28
Component: engine
 2014-10-13 19:30:33 -07:00
Michael Crosby
10d7388bf5 Merge pull request #8547 from erikh/onbuild-cmd 
builder: ONBUILD triggers were not accurately being executed in JSON cases
Upstream-commit: 2c5ad1ac3e4c2a973a29ff5d7617ca2643ffcd49
Component: engine
 2014-10-13 19:29:16 -07:00
Sven Dowideit
f1da875f18 Merge pull request #8226 from SvenDowideit/more-daemon-option-information 
More daemon option information
Upstream-commit: 18b507c49e6f7385b05b8a11b64237405bb2ee68
Component: engine
 2014-10-14 12:06:14 +10:00
SvenDowideit
65957340a9 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)
Upstream-commit: 5bcff59febc1ac798d735b52cc4e92db1ab41bd9
Component: engine
 2014-10-14 12:05:09 +10:00
Erik Hollensbe
3381602232 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)
Upstream-commit: 1150c1639a9efbd2e5e4ac1e71961aef77a32de0
Component: engine
 2014-10-14 01:59:45 +00:00
Sven Dowideit
d8ad6bf5ed 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...
Upstream-commit: 587e2f1ddc98ab3fafaea9647b4abe2419223e3f
Component: engine
 2014-10-14 11:55:12 +10:00
Sven Dowideit
ebe6667d49 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)
Upstream-commit: 5bf3ac573816d718a1c318e5eea7da0142ae92d1
Component: engine
 2014-10-14 11:54:41 +10:00
Sven Dowideit
7d2db2fad6 Merge pull request #8525 from duglin/Issue4789 
Add more info about the LINK env vars created
Upstream-commit: 9d5e3a54a0237bb9bf5a752d49959fed751f02a3
Component: engine
 2014-10-14 11:24:17 +10:00
Fred Lifton
9224b478c9 Adding release notes for 1.3. 
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: 30cfa148b9b4bfe390cbd7936e77efe2962bd506
Component: engine
 2014-10-13 17:17:41 -07:00
Tibor Vass
2c7648b4f0 Merge pull request #8541 from crosbymichael/update-libcontainer-oct1 
Update libcontainer to 4f409628d80b9842004a3f17c92
Upstream-commit: 839660ada11389892c0dfd43060b69ec7725d7b4
Component: engine
 2014-10-13 17:54:27 -04:00
Fred Lifton
45c1f10b20 Merge pull request #8462 from SvenDowideit/document-how-to-add-a-new-document 
Mention the mkdocs.yml file for adding new documents
Upstream-commit: 939227a81a6055ea7984b047f95f9b3d387ba0c3
Component: engine
 2014-10-13 13:15:00 -07:00
Fred Lifton
f7ce34d394 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
Upstream-commit: c2096d70968e9c003608fd14237afc4b189fa03f
Component: engine
 2014-10-13 13:12:05 -07:00