docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code Activity
47,845 Commits 92 Branches 28 Tags
c16b77e4a204da17037641db2eadff84035cee92
Commit Graph

47845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Doug Davis
b485d3dfa7 Merge pull request #11567 from draghuram/contrib-docs 
Fix typo in git setup doc.
 2015-03-22 11:31:00 -04:00
Raghuram Devarakonda
f5c60fc0fd Fix typo in git setup doc. 
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
 2015-03-22 11:22:47 -04:00
Peter Waller
671c12204c 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>
 2015-03-22 11:31:28 +00:00
Evan Hazlett
5c5fc37bc5 Merge pull request #825 from ehazlett/git-commit-version 
Git commit version info
 2015-03-21 22:30:55 -04:00
Evan Hazlett
3392671988 Merge pull request #827 from nathanleclaire/libmachine_provision_merge 
Add provisioning based on OS
 2015-03-21 22:29:57 -04:00
Simon Eskildsen
3a33bff7fd 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>
 2015-03-22 02:06:50 +00:00
Mary Anthony
f3b7bf9682 Clarifying structure in light of Kitematic 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-03-21 18:20:25 -07:00
sidharthamani
eaecd8b1b5 add syslog driver 
Signed-off-by: wlan0 <sid@rancher.com>
 2015-03-21 18:01:18 -07:00
Jessie Frazelle
e40fc2f038 Merge pull request #11546 from moxiegirl/bday-edits-before 
Update contributor docs and triage to match new labeling system
 2015-03-21 16:25:10 -07:00
Doug Davis
4c443facf4 Merge pull request #11543 from ahmetalpbalkan/TestBuildSpaces 
integ-cli: fix bug and race in TestBuildSpaces
 2015-03-21 19:20:17 -04:00
Mary Anthony
3ff9991bb2 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>
 2015-03-21 15:55:33 -07:00
Jessie Frazelle
b6e20a67f9 Merge pull request #11454 from hqhq/fix_memoryswap_warning 
do not warning when we disable memoryswap
 2015-03-21 15:23:25 -07:00
Alexandre Beslic
24b46bb002 Merge pull request #489 from Nickology/488-filters-typos 
Corrected two typos
 2015-03-21 15:06:14 -07:00
Nicolas Jouannem
cb3f330696 Corrected two typos. 
Signed-off-by: Nicolas Jouannem <nick@nickology.com>
 2015-03-21 21:28:07 +01:00
Ken Pepple
81a9765d35 add pause/savestate scnearios to virtualbox integration tests 
Signed-off-by: Ken Pepple <ken@solinea.com>
 2015-03-21 13:13:54 -07:00
Ahmet Alp Balkan
28a34dfffd 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>
 2015-03-21 19:43:14 +00:00
Evan Hazlett
c6d1b6d144 Merge pull request #830 from ehazlett/changelog-update 
update changelog
 2015-03-21 14:20:43 -04:00
Evan Hazlett
74af687d44 update changelog 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-21 14:20:07 -04:00
Nathan LeClaire
3b2c8f9845 Migrate (swarmConfig) => (swarmOptions) 
and (SwarmConfig) => (SwarmOptions)

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Migrate (authConfig) => (authOptions)
        (AuthConfig) => (AuthOptions)

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Migrate (hostConfig) => (hostOptions)
        (HostConfig) => (HostOptions)

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-03-20 23:20:11 -07:00
Mitch Capper
b7dc9040f0 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>
 2015-03-20 21:54:33 -07:00
Nathan LeClaire
04f5679e4f Add test for validation 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-03-20 21:47:11 -07:00
Doug Davis
8071bf3967 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>
 2015-03-20 21:39:49 -07:00
Nathan LeClaire
d91d777f6e Merge pull request #2 from ehazlett/provision-updates 
provisioner: migration functions
 2015-03-20 21:11:24 -07:00
Evan Hazlett
68397cfced bats updates 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-20 23:44:22 -04:00
Evan Hazlett
28789604e9 provisioner: finished migration functions 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-20 23:17:42 -04:00
Doug Davis
6d66e3e7a5 Fix some escaping around env var processing 
Clarify in the docs that ENV is not recursive

Closes #10391

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-03-20 20:09:00 -07:00
Jeffrey Morgan
6669389580 Update ROADMAP.md 2015-03-20 19:57:11 -07:00
Qiang Huang
0aa250bd60 fix decode data loss when using int64 in json 
The problem is when I create container though REST api, set memory limit
in hostConfig, the memory limit didn't work. Because when we DecodeEnv,
we got hostConfig part of Env like this:
{"Binds":["/:/tmp"],"CpuShares":512,"CpusetCpus":"0,1","Devices":[],"Memory":1.6777216e+07,"MemorySwap":0}

And we cannot unmarshal number 1.6777216e+07 into Go value of type int64,
so we got 0.

We can fix this by setting Decoder as UseNumber().

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-03-21 10:16:18 +08:00
Jeffrey Morgan
f7f4fa8c5b Adding development steps 2015-03-20 19:03:12 -07:00
Aanand Prasad
02f119e4b7 Merge pull request #1145 from aanand/labels 
Implement `labels` option
 2015-03-20 18:53:26 -07:00
Aanand Prasad
721327110d Add 'labels:' config option 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-20 18:12:04 -07:00
Aanand Prasad
d209ded13c Use dev version of Docker 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-20 18:12:04 -07:00
Ahmet Alp Balkan
878a39fef2 Import Azure driver for factory registration 
Importing Azure storage driver to make it register itself as
a storage driver.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-03-20 17:44:25 -07:00
Doug Davis
e3e6f8e859 Merge pull request #11531 from vishh/parent-cgroup 
Remove debug log line from cgroup-parent feature e2e test.
 2015-03-20 20:30:01 -04:00
Stephen Day
50393dbe22 Merge pull request #270 from stevvooe/roadmap 
Add ROADMAP.md to the project and cleanup existing items
 2015-03-20 17:16:31 -07:00
Stephen Day
15a7926288 Merge pull request #230 from diogomonica/adding-healthcheck 
registry/health: adding healthcheck package
 2015-03-20 17:15:37 -07:00
Nathan LeClaire
263c802d34 Fix missing test files 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-03-20 17:05:27 -07:00
Stephen Day
57a6854ae0 Merge pull request #281 from tcnghia/patch-1 
Update api.md
 2015-03-20 16:51:09 -07:00
Michael Crosby
84d3ab30d4 Merge pull request #11492 from coolljt0725/fix_hostname_missing_in_container_netmode 
Fix hostname missing when a container's net mode is contaienr mode
 2015-03-20 16:49:37 -07:00
Nathan LeClaire
d189baf36c Move fakedriver to its own module for reuse 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-03-20 16:48:47 -07:00
Michael Crosby
ca6512acba Merge pull request #11272 from dmcgowan/enable-v2-default-push 
Enable v2 default push
 2015-03-20 16:47:32 -07:00
Michael Crosby
ca3a912287 Merge pull request #11528 from jlhawn/separate_init_blob_upload 
Separate init blob upload
 2015-03-20 16:39:31 -07:00
Nathan LeClaire
73862e863c Update tests to work with new provisioning 
Also, comment provisioner interface slightly better.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-03-20 16:30:46 -07:00
Nathan LeClaire
7b5c8a023f Clean up some remaining issues with libmachine merge 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-03-20 16:30:46 -07:00
Nathan LeClaire and Simon Thulborn
49feb33457 Implement majority of provisioning changes 
Signed-off-by: Simon Thulborn <simon+github@thulborn.com>
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-03-20 16:30:46 -07:00
Vishnu Kannan
a7639c2e1f Remove debug log line from cgroup-parent feature e2e test. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2015-03-20 23:25:34 +00:00
Doug Davis
c536e5bfb4 Merge pull request #11397 from ahmetalpbalkan/win-cli/build-warning 
Add cli build warning about chmod bits on windows
 2015-03-20 19:19:38 -04:00
Aanand Prasad
49c2080bcd Merge pull request #1088 from aanand/extends 
`extends` – Inherit services from other services
 2015-03-20 16:00:50 -07:00
Jessie Frazelle
57f061211a Merge pull request #11530 from twhiteman/master 
docs: cli: reorder rename command to be in alphabetical order
 2015-03-20 15:59:44 -07:00
Aanand Prasad
37efdb1f8b Make volume host paths relative to file, merge volumes when extending 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-20 15:45:16 -07:00