Commit Graph

12935 Commits

Author SHA1 Message Date
9d47ebbe4f Add some info about what environment variables are available
Having the list in one spot makes it easier for people to see what's
avaiable instead of having to scan all of the docs and extract the info.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 0d2190e6794df81f3cf3b84707ce3abdf5843100
Component: engine
2015-03-24 18:29:21 -07:00
2ae5f5eb68 Merge pull request #10365 from cpuguy83/9981_fix_cannot_overwrite_nonbind_as_bind
Allow path from normal volume existing to overwrite in start Binds
Upstream-commit: 1fe55b2f8bc966c0784527b30f507cbc90325df7
Component: engine
2015-03-23 10:43:02 -07:00
2ed910fd38 Merge pull request #11406 from MabinGo/CmdStart_fix
Fix hanging up problem when start and attach multiple containers at once
Upstream-commit: bd952021613b26b7d8b8d078adda72d9ff6def00
Component: engine
2015-03-23 10:17:50 -07:00
8814588380 Merge pull request #10347 from unclejack/bufreader_reset
reset bufReader to avoid extreme growth of buffers
Upstream-commit: c4603de56a635086772364af52a62548ad15c2fc
Component: engine
2015-03-23 10:07:43 -07:00
950464de97 Merge pull request #11395 from mitchcapper/master
Change windows default permissions to 755 not 711, read access for all p...
Upstream-commit: 56acb1aac87c489674b708d0d2b2128fa7944f66
Component: engine
2015-03-23 09:59:40 -07:00
53a187728a Merge pull request #11574 from icecrime/release_version_push
Document VERSION file update scheme
Upstream-commit: bf304cc414c98830a4d98cb6b7f253e9397b9813
Component: engine
2015-03-23 09:47:16 -07:00
a1d0fa6752 Fix hanging up problem when start and attach multiple containers
Signed-off-by: Mabin <bin.ma@huawei.com>
Upstream-commit: 7dc1af146d24c346ac74c9dcb1df98f9ef51339d
Component: engine
2015-03-23 12:10:22 +08:00
9dcfa784ef Merge pull request #11538 from duglin/EmptyVolume
Check volume path to make sure its not the empty string
Upstream-commit: ded0ada9b47ab48b57d14225ec663e3756faff7f
Component: engine
2015-03-22 19:25:50 -07:00
088f0e2cb3 Merge pull request #9774 from pwaller/cancellation
Add basic build cancellation
Upstream-commit: 45ee402a631a59e2a33df7b2f63a49f6f3f84f09
Component: engine
2015-03-22 19:16:23 -07:00
d411e326ae Merge pull request #11505 from lloydde/doc-ref-run-it
doc: reference/run introduce -it .
Upstream-commit: 0b63b343e8cb83d21c9de5d986b0a4ae01fb4646
Component: engine
2015-03-22 19:14:34 -07:00
0485dd2e93 Merge pull request #11550 from moxiegirl/adjust-mac-install
Clarifying structure in light of Kitematic
Upstream-commit: 0926a023d65ae7d5cb528d205a4e1fe32b47c3e4
Component: engine
2015-03-22 19:13:38 -07:00
e24a7c417e Merge pull request #11062 from misterbisson/joyentinstall
Installation on Joyent
Upstream-commit: 19295cb37b56648008c2d26bc86e9589a643d1a4
Component: engine
2015-03-23 12:07:49 +10:00
4b3632f9e6 Merge pull request #11532 from dmcgowan/fix-v1-404-issue-11510
Add check for 404 on get repository data
Upstream-commit: 126539540607887b6f1bec4559dfa60c0ae562e5
Component: engine
2015-03-22 18:57:35 -07:00
c6792796c3 Document VERSION file update scheme
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: f07ac12791e4af7f199a893705204481588062ae
Component: engine
2015-03-22 18:45:01 -07:00
bac420baa9 Merge pull request #11566 from tiborvass/carry-10864
Carry 10864: ANSI terminal emulation for windows
Upstream-commit: e09ead98ef41d14d7e3d8784a0edf29d4afd60f5
Component: engine
2015-03-22 18:21:32 -07:00
7cd85af5c7 Merge branch 'master' of github.com:docker/docker into joyentinstall
Reolved conflict in:
	docs/mkdocs.yml

Signed-off-by: Casey Bisson <casey.bisson@joyent.com>
Upstream-commit: a71d89d041d7853698c84ccf233f477383a9dcb3
Component: engine
2015-03-22 18:19:27 -07:00
4b295342e5 Add check for 404 on get repository data
No longer add the body to the error when a 404 is received on get repository data.

closes #11510

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: c8d2ec93caf7c64f3e510e4e75f49614880ed9b9
Component: engine
2015-03-22 18:15:18 -07:00
5ba6e61a95 Merge pull request #11553 from Sirupsen/update-logrus-71
vendor: update logrus to 0.7.1
Upstream-commit: 01506d13fac29b2b340150c4cf01b1e14430f405
Component: engine
2015-03-22 18:11:17 -07:00
7d0f834cb3 Merge pull request #10903 from programmerq/docs_submodules
Update docs around private github submodules in automated builds.
Upstream-commit: cce196d64b50384a71a0fbf1f1026e8580ff9d15
Component: engine
2015-03-23 11:01:28 +10:00
addc7158f4 Merge pull request #11572 from tiborvass/skip-hello-world-test
Skip TestPullVerified because hello-world image cannot be verified
Upstream-commit: 48a954f4b3af4602a2efcbc3e5ba963ce25091d6
Component: engine
2015-03-22 20:09:55 -04:00
2b2e612495 Merge pull request #11400 from ahmetalpbalkan/docs/azure
docs: Add Microsoft Azure installation instructions
Upstream-commit: cf7d093e17d89371cf375a5f66e8103d7dde6e3c
Component: engine
2015-03-23 10:03:00 +10:00
503af64bfc Skip TestPullVerified because hello-world image cannot be verified
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: df389df9904dc1585160d7992c6f3dc150490e05
Component: engine
2015-03-22 19:34:40 -04:00
5b307a9ba4 winconsole: cleanup
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 01a43174dae3b88e264f3139e1a4bf7ee666957f
Component: engine
2015-03-22 15:47:54 -04:00
e1ebdbecb2 Updating in light of new contributors guide
Link to new guide. Added a quickstart contributor guide for experienced people.
Converting narrative style to procedures for easier use. I think there is something missing in the
release publishing section...but it looks like it was missing in the original.
Updates per thaJeztah
Edits per Fred
Updating with comments from Sven

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: fdbec264111ac20b06cdd9b885fe47415a6495e4
Component: engine
2015-03-22 11:55:32 -07:00
9e9a6a8f56 Fix typo in git setup doc.
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
Upstream-commit: f5c60fc0fd4e0daa068134ab9a887f69c797bae7
Component: engine
2015-03-22 11:22:47 -04:00
7c1bfa9093 Implement build cancellation
Add the capability to cancel the build by disconnecting the client.

This adds a `cancelled` channel which is used to signal that a build
should halt. The build is halted by sending a Kill signal and noticing
that the cancellation channel is closed.

This first pass implementation does not allow cancellation during a
pull, but that will come in a subsequent PR.

* Add documentation of cancellation to cli and API

* Protect job cancellation with sync.Once

* Add TestBuildCancelationKillsSleep

* Add test case for build cancellation of RUN statements.

Signed-off-by: Peter Waller <p@pwaller.net>
Upstream-commit: 671c12204cb469d868f646da1474d5bad6541770
Component: engine
2015-03-22 11:31:28 +00:00
c88ab1e8ac vendor: update logrus to 0.7.1
Changes relevant for Docker since 0.6.6 are (most other changes are hooks and
options for formatters):

* Debugging color output changed to gray.
* Don't quote the number 9 when it's by it self (i.e. `omg=9` instead of
  `omg="8"`, this was the case for all other numbers)
* Performance is better when running a high logging level with lots of low-level
  logging.
* Minor internal refactoring and more tests.

Signed-off-by: Simon Eskildsen <sirup@sirupsen.com>
Upstream-commit: 3a33bff7fdd96705e761bb1f1750cfa6f4df4070
Component: engine
2015-03-22 02:06:50 +00:00
d2583ecaca Clarifying structure in light of Kitematic
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: f3b7bf9682c10cdd6dfbdca79080790d7411c1b7
Component: engine
2015-03-21 18:20:25 -07:00
3e27a02d3e Merge pull request #11546 from moxiegirl/bday-edits-before
Update contributor docs and triage to match new labeling system
Upstream-commit: e40fc2f0385353c0e62b17a3653992592ea571b6
Component: engine
2015-03-21 16:25:10 -07:00
8fb2e38bd2 Merge pull request #11543 from ahmetalpbalkan/TestBuildSpaces
integ-cli: fix bug and race in TestBuildSpaces
Upstream-commit: 4c443facf452903b01f337a4a19ad07d646b3835
Component: engine
2015-03-21 19:20:17 -04:00
3e6a579992 Update contributor docs and triage to match new labeling system
Add clarification around experience
Adding test
improvement > enhancement

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 3ff9991bb27b238b0df4f67b6714174ca92223eb
Component: engine
2015-03-21 15:55:33 -07:00
8a89ab91de Merge pull request #11454 from hqhq/fix_memoryswap_warning
do not warning when we disable memoryswap
Upstream-commit: b6e20a67f915c8be0b2829742ab32dea3d342905
Component: engine
2015-03-21 15:23:25 -07:00
4a7e6e031f integ-cli: fix bug and race in TestBuildSpaces
`TestBuildSpaces` is used to do string manipulation to redact timestamps
from compared cmd output. However it was assuming there is going to be
only one `time=".."` in the output --not the case on windows. Therefore
I wrote a regexp to redact all log timestamps.

Also the test used to have a copy/paste bug (see err1/err2). This fixes
that, too.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 28a34dfffdce359a5674cfda0a90b25b1f4d4d97
Component: engine
2015-03-21 19:43:14 +00:00
62b8050640 Change windows default permissions to 755 not 711, read access for all poses little security risk and prevents breaking existing Dockerfiles
Signed-off-by: Mitch Capper <mitch.capper@gmail.com>
Upstream-commit: b7dc9040f04fe8dacd2f14c6b93d1b0bb6bde333
Component: engine
2015-03-20 21:54:33 -07:00
bafff954ca Check volume path to make sure its not the empty string
With this Dockerfile
```
FROM ubuntu
ENV ABC=""
VOLUME $ABC
```

It builds ok but then at run time I get this error:

FATA[0002] Error response from daemon: Cannot start container 8902b4a7aaf5c4e4b11a38070d392db465fa97ad88c91c8b38dda5ab8149ccac: [8] System error: no such file or directory

Because the Volume config shows "" as the path.  This PR checks for "" as
the path and stops it at build time.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 8071bf396747d3ad01db504a417b75fe7a52608a
Component: engine
2015-03-20 21:39:49 -07:00
7d0cfe4c45 Merge pull request #11531 from vishh/parent-cgroup
Remove debug log line from cgroup-parent feature e2e test.
Upstream-commit: e3e6f8e85961f2e86cb328a7739f43285c7daefa
Component: engine
2015-03-20 20:30:01 -04:00
b2b558afeb Merge pull request #11492 from coolljt0725/fix_hostname_missing_in_container_netmode
Fix hostname missing when a container's net mode is contaienr mode
Upstream-commit: 84d3ab30d48a5194f7af93bccbd3b230b5115104
Component: engine
2015-03-20 16:49:37 -07:00
7fbcb7a86b Merge pull request #11272 from dmcgowan/enable-v2-default-push
Enable v2 default push
Upstream-commit: ca6512acba714fb3e44849f6ffb5e4cf7b9593b8
Component: engine
2015-03-20 16:47:32 -07:00
6df3fa6b80 Merge pull request #11528 from jlhawn/separate_init_blob_upload
Separate init blob upload
Upstream-commit: ca3a912287b6befb5016d358a6b763b0aa72b701
Component: engine
2015-03-20 16:39:31 -07:00
bbeee5cd0d Remove debug log line from cgroup-parent feature e2e test.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: a7639c2e1f377b1f5903bb6435473cba4db6522f
Component: engine
2015-03-20 23:25:34 +00:00
632e09a6f3 Merge pull request #11397 from ahmetalpbalkan/win-cli/build-warning
Add cli build warning about chmod bits on windows
Upstream-commit: c536e5bfb4e8f501ec27a9cc6d55b64d8f1a1603
Component: engine
2015-03-20 19:19:38 -04:00
de12861892 Merge pull request #11530 from twhiteman/master
docs: cli: reorder rename command to be in alphabetical order
Upstream-commit: 57f061211aa0870f0fdac2c5f86c0d62f84322fd
Component: engine
2015-03-20 15:59:44 -07:00
5856180baf Merge pull request #11525 from cpuguy83/10969-cleanup-unix-sockets
cleanup unix sockets
Upstream-commit: 41f2b010c6ecf210253fe5a0e8f8b918cb8c534e
Component: engine
2015-03-20 14:55:17 -07:00
e8bf8127c1 docs: cli: reorder rename command to be in alphabetical order
Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com>
Upstream-commit: fe21c7a4bebd5d6d0065e0529d03a03723fc697b
Component: engine
2015-03-20 14:51:39 -07:00
7772935737 updated text
per recommendations in https://github.com/docker/docker/pull/11062#issuecomment-82435939

Signed-off-by: Casey Bisson <casey.bisson@joyent.com>
Upstream-commit: 19e3db35039ae80409623266906093b2314bd970
Component: engine
2015-03-20 14:44:24 -07:00
f8785b1704 Merge branch 'master' of github.com:docker/docker into joyentinstall
Resolved conflict in the following file:
	docs/sources/installation/MAINTAINERS

File was deleted upstream and changed in this branch. Deleting the file in this branch as well.

Signed-off-by: Casey Bisson <casey.bisson@joyent.com>
Upstream-commit: cb2280c98e3a2aa389b64adcafb30a446e2b6d24
Component: engine
2015-03-20 14:37:17 -07:00
638765fe3b Add cli build warning about chmod bits on windows
This shows a warning message about adjusted file/directory permission bits
when the `docker build` cli command is executed on windows.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 4a8b3cad6096854027151dfbcfb4b2cd8841ad95
Component: engine
2015-03-20 20:13:32 +00:00
e131073558 Separate init blob upload
Pushing a v2 image layer has two steps:

- POST to get a new upload URL
- PUT to that upload URL

We were previously not checking the response code of
the POST request and the PUT would fail in weird ways.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 73b33db04b29a516bf8c50fbe646f563298fcfd9
Component: engine
2015-03-20 13:11:05 -07:00
919e9683e3 Enable v2 default push
When pushing to the official registry, v2 push will be attempted first. If the v2 endpoint is unavailable, a push to v1 will occur. If a v2 push is started and failed, the push operation will fail. Pulling non-official images the official v2 registry is also enabled to pull the newly push images. When a pull of a v2 image fails, v1 will always be attempted.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 770e9b6b819b495a933b2f467bf768a1b785d5ad
Component: engine
2015-03-20 11:09:33 -07:00
86ac9e315e Merge pull request #11475 from estesp/registry-is-distribution
We should point README readers at the new registry v2 project
Upstream-commit: 79744811623cc794d028abfc70ac3f58db9f4b9b
Component: engine
2015-03-20 13:59:25 -04:00