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
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
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
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
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
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
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
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
2c00860ff9
Minor fix of tests names
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: fcfe80f63397c0a8bdd6605798c0639ec3dcda56
Component: engine
2014-10-14 11:47:01 -07:00
b0b0bf7337
Add logDone for TestBuildAddSingleFileToNonExistDir
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: fbaa41b5aa920ca752481e1b94aeff29857cb76d
Component: engine
2014-10-14 11:17:41 -07:00
04647d4951
Replace '%s' in test utils
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 949ab477103c93d6d4779b35efbd647541eb1b14
Component: engine
2014-10-14 10:59:38 -07:00
edf116b62c
Replace '%s' in run tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: c091397d518408a7a9c493f066dc47438d588985
Component: engine
2014-10-14 10:59:19 -07:00
ad9f9cb9fd
Replace '%s' in rm tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: be31a66b7a1f015d4f1448baebd7c7eb2c23e506
Component: engine
2014-10-14 10:59:11 -07:00
5203b5e653
Replace '%s' in diff tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: a44296603f8188278241cc8d8a353952ee50ec54
Component: engine
2014-10-14 10:59:01 -07:00
be07c0e702
Replace '%s' in create tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 91f33fcaaaa47ef60acc4a8cfa7a2be41edd724e
Component: engine
2014-10-14 10:58:35 -07:00
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
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
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
381b9857ce
Fix support for --env-file in bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: ba311ee58a7114270d7853ebae5f1e86efdc8005
Component: engine
2014-10-14 17:45:29 +02:00
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
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
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
456ba41de5
add BytesSize in pkg/units
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: ae4689f14d59ece06bbd2a08a9687dc075e42d6d
Component: engine
2014-10-14 03:54:32 +00:00
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
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
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
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
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
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
05808ba39b
Move registry search API docs into the registry API document.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 6b285c4cd6fe4a28c73a7137fe47753510befd3f
Component: engine
2014-10-14 11:53:10 +10:00
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
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
02bd8df632
Link directly to the 'latest' release alias
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 380fe94614cecad6af85263af17245c5fc4103e8
Component: engine
2014-10-14 09:20:55 +10:00
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
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
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
e907084e52
Merge pull request #8532 from SvenDowideit/demote-readme.md-header
...
README.md is a sub-section in how to build automated builds
Upstream-commit: 66b9694b583c99b2309cb763dc106f6f3fcdd69c
Component: engine
2014-10-13 13:02:41 -07:00
b3ff7a5ede
Update libcontainer to 4f409628d80b9842004a3f17c92
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 8fedf718ce0c788311d8d3382b0aaeb9b9a792d4
Component: engine
2014-10-13 19:53:20 +00:00
43d8393163
Merge pull request #8528 from SvenDowideit/hide-side-toc-for-search
...
Hide the empty sidebar TOC on the search page
Upstream-commit: 547c42d8d0027e7148f63d7d39a954328aab1e36
Component: engine
2014-10-13 12:13:06 -07:00
8a8dc55658
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...
Upstream-commit: 3040c8b759d2a17ee49d81b3be48237fd87086a1
Component: engine
2014-10-13 12:12:18 -07:00
304a5b7a01
Merge pull request #8517 from sequenceiq/master
...
docs: fixing docker.io api
Upstream-commit: 6ce3967f8f5fdcd1ae2b1bdaba483ed9654e6f29
Component: engine
2014-10-13 12:09:39 -07:00
33f3f70f42
Merge pull request #8503 from aanand/tlsverify-environment-variable
...
Add DOCKER_TLS_VERIFY environment variable, equivalent to --tlsverify flag
Upstream-commit: ce669297df2981214c5d01e54c358347c5852ef7
Component: engine
2014-10-13 10:20:10 -07:00
b5c4deb0f6
Merge pull request #8435 from SvenDowideit/explain-docker-attach-more
...
Add more info on attach inspired by discussion in #2855
Upstream-commit: 42b217044a0a00af3ccf4e801e162014f67d941a
Component: engine
2014-10-13 13:19:22 -04:00
87e05c54cf
Merge pull request #8523 from duglin/FixLinkCmdLine
...
Fix href in docs w.r.t. cgroups freezer pointer
Upstream-commit: e3101a3508a67fd7653ad95052845513facb6569
Component: engine
2014-10-13 13:18:49 -04:00
84dc0f709d
Merge pull request #8524 from duglin/Regardless
...
Fix typo: reguardless should be regardless
Upstream-commit: 8a32aa26c1c47f3197a7dc690e16412137af95b7
Component: engine
2014-10-13 13:18:21 -04:00
9e41637039
Merge pull request #8507 from duglin/Issue3087
...
Add some docs about which env vars are defined in new containers
Upstream-commit: fe03da7da87e174a1f1635881e60da6186077289
Component: engine
2014-10-13 13:13:43 -04:00
830a3741c6
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 >
Upstream-commit: 19fb942d3609f647adeda68c6ca106371c7b32ac
Component: engine
2014-10-13 11:49:26 +01:00
a91e1dbdcd
Add info on --device flag permissions ':rwm'
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 2709c4677c252a07d49a24f7583adcc17b38fa14
Component: engine
2014-10-13 17:41:12 +10:00
608d55c5e6
Add more info on attach inspired by discussion in #2855
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 801edfa9b8a765e734ac4a909ab032f0cb03fe87
Component: engine
2014-10-13 17:30:08 +10:00
22879cb40f
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)
Upstream-commit: 3d2f10e28ae6aa278aca4403d2e3b55cc8071022
Component: engine
2014-10-13 17:06:18 +10:00
