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
Aanand Prasad
7c087f1c07 Support fig.y(a)ml and show a deprecation warning 
Closes #864

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-29 13:14:44 -05:00
Fred Lifton
9e10a888a3 Merge pull request #10428 from mehulkar/patch-1 
Improve explanation of port mapping from containers
 2015-01-29 10:07:24 -08:00
Evan Hazlett
daa8238a41 use hostname for azure instead of generating 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-01-29 12:50:47 -05:00
Mehul Kar
f1bc02e91f Improve explanation of port mapping from containers 
Signed-off-by: Mehul Kar <mehul.kar@gmail.com>
 2015-01-29 09:09:44 -08:00
Simon Thulbourn
4e4c619d11 Image docs 
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
 2015-01-29 16:09:46 +00:00
James Turnbull
ba8e1673ad Merge pull request #10351 from duglin/FixDocsWorkdir 
Fix docs so WORKDIR mentions it works for COPY and ADD too
 2015-01-29 09:52:01 -05:00
Evan Hazlett
d1ee81453c add timeout for b2d release check; warn instead of error if cannot check 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-01-29 09:15:15 -05:00
Sven Dowideit
0ce3a49d64 DHE documentation placeholder and Navbar changes 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-01-29 20:50:43 +10:00
Alexander Morozov
d400ac756c Merge pull request #10433 from guoxiuyan/Fix_typo 
Fix a minor typo
 2015-01-28 20:57:35 -08:00
Andrea Luzzardi
ead7c278bd Simplify travis file. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-01-28 19:04:25 -08:00
Doug Davis
761a020f9d Add builder folks to the top-level maintainers file 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-01-28 18:32:38 -08:00
Tibor Vass
fb9363eb2a Merge pull request #10368 from jfrazelle/lingering-exec-test 
Move one last exec test :)
 2015-01-28 21:21:05 -05:00
guoxiuyan
07d190a61c Fix a minor typo 
Signed-off-by: Guo Xiuyan <guoxiuyan@huawei.com>
 2015-01-29 10:15:56 +08:00
Alexander Morozov
e16bcc3928 Fix logs, so now, old and followed logs has same format without [] 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-01-28 17:57:10 -08:00
James Turnbull
c9b03c6095 Merge pull request #10142 from thaJeztah/docs-use-example-image 
Replace "base" with "debian" in API documentation
 2015-01-28 20:40:02 -05:00
Ben Firshman
fd30920aac Merge pull request #897 from aanand/nicer-env-file-error 
Nicer env file error
 2015-01-29 00:51:05 +00:00
Derek McGowan
c1e3f61961 Add distribution maintainers to maintainers files 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-01-28 16:30:00 -08:00
Victor Vieux
78d86ac38a Merge pull request #327 from aluzzardi/vieux-fix_match 
Fix affinity matching.
 2015-01-28 15:50:46 -08:00
Andrea Luzzardi
51e89bc928 constraint filter: Simplify code. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-01-28 15:35:40 -08:00
Victor Vieux
e9130cac52 Merge pull request #320 from aluzzardi/godep-dockerfile 
Dockerfile: Build swarm with vendored dependencies.
 2015-01-28 15:11:08 -08:00
Victor Vieux
30a5f64893 Merge pull request #328 from aluzzardi/fix-panic-eventhandler 
Fix a panic that occurs in the log handler when pulling images.
 2015-01-28 14:54:59 -08:00
Derek McGowan
94309badec Allow single name component repository names 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-01-28 14:51:02 -08:00
Aanand Prasad
9bc7604e0e Make sure we're testing uppercase directories properly 
(OS X is case-sensitive so we can't have fixture dirs which are
identically named if you ignore case)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-28 17:19:27 -05:00
Sebastiaan van Stijn
c0969ed3d8 Replace "base" with "ubuntu" in documentation 
The API documentation uses the "base" image in various
places. The "base" image is deprecated and it is no longer
possible to download this image.

This changes the API documentation to use "ubuntu" in stead.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-01-28 22:54:10 +01:00
Michael Crosby
b505db5e3c Merge pull request #10420 from tianon/ubuntu-version 
Update .deb version numbers to be more sane
 2015-01-28 13:50:12 -08:00
Tianon Gravi
0fab79f203 Update .deb version numbers to be more sane 
Example output:
```console
root@906b21a861fb:/go/src/github.com/docker/docker# ./hack/make.sh binary ubuntu
bundles/1.4.1-dev already exists. Removing.

---> Making bundle: binary (in bundles/1.4.1-dev/binary)
Created binary: /go/src/github.com/docker/docker/bundles/1.4.1-dev/binary/docker-1.4.1-dev

---> Making bundle: ubuntu (in bundles/1.4.1-dev/ubuntu)
Created package {:path=>"lxc-docker-1.4.1-dev_1.4.1~dev~git20150128.182847.0.17e840a_amd64.deb"}
Created package {:path=>"lxc-docker_1.4.1~dev~git20150128.182847.0.17e840a_amd64.deb"}

```

As noted in a comment in the code here, this sums up the reasoning for this change: (which is how APT and reprepro compare versions)
```console
$ dpkg --compare-versions 1.5.0 gt 1.5.0~rc1 && echo true || echo false
true
$ dpkg --compare-versions 1.5.0~rc1 gt 1.5.0~git20150128.112847.17e840a && echo true || echo false
true
$ dpkg --compare-versions 1.5.0~git20150128.112847.17e840a gt 1.5.0~dev~git20150128.112847.17e840a && echo true || echo false
true
```

ie, `1.5.0` > `1.5.0~rc1` > `1.5.0~git20150128.112847.17e840a` > `1.5.0~dev~git20150128.112847.17e840a`

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-01-28 14:26:40 -07:00
Andrea Luzzardi
269cbb0cf4 exec bit on shell files. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-01-28 13:26:34 -08:00
Aanand Prasad
de07e0471e Show a nicer error when the env file doesn't exist 
Closes #865

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-28 16:20:01 -05:00
Aanand Prasad
dfc6206d0d Extract get_env_files() 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-28 16:18:02 -05:00
Aanand Prasad
6c45b6ccdb Make sure we're testing blank lines and comments in env files 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-28 16:18:02 -05:00
Andrea Luzzardi
acd036365d Fix a panic that occurs in the log handler when pulling images. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-01-28 12:29:41 -08:00
Andrea Luzzardi
df4ffb5a7b affinity: Ensure affinities can be chained. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-01-28 12:16:23 -08:00
Andrea Luzzardi
04fc1ab997 expr: Get rid of MatchEmpty. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-01-28 12:12:09 -08:00
Andrea Luzzardi
fc192b7077 affinity: Fix expression matching by passing arguments in bulk. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-01-28 12:07:20 -08:00
Andrea Luzzardi
5627b390df filter expr: Test that the order in Match doesn't matter. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-01-28 12:07:20 -08:00
Victor Vieux
2f1a9b21b6 fix match 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-01-28 12:07:20 -08:00
Tibor Vass
70fbd45a5c Merge pull request #10123 from duglin/Issue10097 
Build CMD/ENTRYPOINT cache strings properly
 2015-01-28 14:43:16 -05:00
Stephen Day
26b01842e3 Add Stephen Day to maintainers file 2015-01-28 10:31:54 -08:00
Michael Crosby
17e840a47a Merge pull request #10416 from icecrime/update_fish_completion 
Update fish completion for 1.5.0
 2015-01-28 10:28:47 -08:00
Arnaud Porterie
45ef269498 Merge pull request #10406 from estesp/fixup-ipv6-bridge-creation 
Fix bridge initialization for IPv6 if IPv4-only docker0 exists
 2015-01-28 10:17:45 -08:00
Evan Hazlett
7d6fd1f791 Merge pull request #429 from ehazlett/env-command 
rename shellinit to env
 2015-01-28 13:03:25 -05:00
Evan Hazlett
eafc0048f0 rename shellinit to env 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-01-28 13:01:25 -05:00
Jessica Frazelle
ef957f4351 Added tianon's info and changed a typo. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2015-01-28 09:54:48 -08:00
Evan Hazlett
62f46b207f Merge pull request #428 from ehazlett/fix-dns-length-azure 
fix issue with name and dns length in azure
 2015-01-28 12:50:44 -05:00
Evan Hazlett
f4342ed4ce fix issue with name and dns length in azure 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-01-28 12:47:01 -05:00
Evan Hazlett
071a64eb63 Merge pull request #414 from ehazlett/fix-custom-tls-certs 
use correct paths for custom TLS CA cert and key
 2015-01-28 12:44:49 -05:00
Jessie Frazelle
13b6461570 Merge pull request #10398 from LK4D4/export_daemon_vars 
Export DOCKER_GRAPHDRIVER and DOCKER_EXECDRIVER in integration-cli
 2015-01-28 09:44:39 -08:00
Arnaud Porterie
9cea20ffc5 Update fish completion for 1.5.0 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-01-28 08:52:06 -08:00
Arnaud Porterie
2cb82c11cf Merge pull request #10372 from dmcgowan/v2-registry-buffer-push 
Buffer tar file on v2 push
 2015-01-28 08:47:21 -08:00
Arnaud Porterie
f23c136a95 Merge pull request #10357 from jfrazelle/bash-completion-stats 
Add completion for stats.
 2015-01-28 08:29:06 -08:00