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
Sun Hongliang
c1100ab3a2 change the way of producing engine label 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-07-07 11:30:02 +08:00
Aanand Prasad
7f54850b4a Merge pull request #3698 from docker/bump-1.8.0-rc2 
Bump 1.8.0 rc2
 2016-07-06 19:11:03 -07:00
Dongluo Chen
b9de046b4f Merge pull request #2300 from allencloud/remove-unnecessary-err-check 
remove unnecessary err check and make check better
 2016-07-06 18:36:49 -07:00
Aanand Prasad
c72c966abc Bump 1.8.0-rc2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-06 18:05:11 -07:00
Aanand Prasad
801167d271 Pin base image to alpine:3.4 in Dockerfile.run 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-06 18:05:10 -07:00
Daniel Nephin
408e4719e1 Update requirements.txt 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-07-06 16:49:14 -07:00
Jonathan Giannuzzi
dbf40d8244 Fix assertion that was always true 
Signed-off-by: Jonathan Giannuzzi <jonathan@giannuzzi.be>
 2016-07-06 16:36:10 -07:00
Victoria Bialas
6021237a69 fixes broken links in 3 Compose docs files due to topic re-org in PR#23492 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-07-06 16:26:38 -07:00
Aanand Prasad
e4159cfd42 Fix alias tests on 1.11 
The fix in 8e0458205241f654bb1d75de9babd9880afa7206 caused a regression
when testing against 1.11.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-06 16:20:18 -07:00
Daniel Nephin
d8ec9c1572 Upgrade pip on osx 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-07-06 16:20:18 -07:00
Aanand Prasad
244b303625 Fix test: check container's Env array instead of the output of 'env' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-06 16:20:18 -07:00
Aanand Prasad
217f762a60 Post-merge fix - restore Environment import in main.py 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-06 16:20:18 -07:00
Joffrey F
70da16103a Unset env vars behavior in 'run' mirroring engine 
Unset env vars passed to `run` via command line options take the
value of the system's var with the same name.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-07-06 16:20:17 -07:00
Aanand Prasad
6b71645ed7 Fix tests to accommodate short-id container alias 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-06 16:20:17 -07:00
Ke Xu
05bf9a054a add zsh completion for push 
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
 2016-07-06 16:20:17 -07:00
Ke Xu
6e3d82eea6 change dsb to dab 
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
 2016-07-06 16:20:17 -07:00
Ke Xu
21d114b879 add zsh completion support for bundle 
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
 2016-07-06 16:20:17 -07:00
Aanand Prasad
72849d99c0 Update bundle extension 
It's now .dab, for Distributed Application Bundle

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-06 16:20:17 -07:00
Harald Albers
85e3ad2655 bash completion for docker-compose push 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-07-06 16:20:17 -07:00
Harald Albers
a3e30c3eed bash completion for docker-compose bundle 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-07-06 16:20:17 -07:00
Joffrey F
6fd77fa698 Update docker-py version in requirements 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-07-06 16:20:17 -07:00
Daniel Nephin
a7fc3e2220 Add an acceptance test for bundle. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-07-06 16:20:16 -07:00
Daniel Nephin
db02c9f537 Add some unit tests for new bundle and push commands. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-07-06 16:20:16 -07:00
Aanand Prasad
33cc601176 Warn on missing digests, don't push/pull by default 
Add a --fetch-digests flag to automatically push/pull

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-06 16:20:16 -07:00
Aanand Prasad
44e82edc5f Merge pull request #3221 from aeriksson/fix-zsh-autocomplete 
Fix zsh autocomplete
(cherry picked from commit c0237a487b31e1d3e4b67fb180bd7db219e5d858)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-06 16:20:16 -07:00
Aanand Prasad
53341b82f9 Merge remote-tracking branch 'release/release' into bump-1.8.0-rc2 2016-07-06 16:05:34 -07:00
Nathan LeClaire
d6f4f9841c Bump to Toolbox 1.12.0-rc3 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-07-06 14:29:29 -07:00
Aaron Culich
f171370343 remove LTS from Ubuntu 15.10 in aws driver docs 
The 14.04.x and 16.04 [release](https://wiki.ubuntu.com/Releases) are LTS., but Ubuntu 15.10 is not an LTS release, so I'd suggest removing that designation from the docs.

Signed-off-by: Aaron Culich <aculich@berkeley.edu>
 2016-07-05 22:40:16 -07:00
Nathan LeClaire
34ea48e7dc Merge pull request #3564 from cdrage/add-variantid-to-osrelease 
Add VARIANT and VARIANT_ID to os-release
 2016-07-05 16:39:16 -07:00
Nathan LeClaire
7712452207 Merge pull request #3546 from leonhartX/master 
add swarm-join-opt support
 2016-07-05 16:35:08 -07:00
Nathan LeClaire
338744a639 Merge pull request #3571 from nathanleclaire/disable_nonswarm_ext_attribute_client_for_server_cert 
Disable extended key usage as a client for non-Swarm-master server certs
 2016-07-05 16:23:35 -07:00
Nathan LeClaire
c0b721b5f9 Disable extended key usage as a client for non-Swarm-master server certs 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-07-05 16:08:28 -07:00
Nishant Totla
e7b8b4c6eb Merge pull request #2375 from NanXiao/error-handle-in-postContainersCreate 
Check r.ParseForm() error in postContainersCreate().
 2016-07-05 10:17:21 -07:00
Alexandre Beslic
2700d0b75c Merge pull request #2385 from clhlc/master 
fix Switch the primary docs
 2016-07-05 10:15:17 -07:00
Vincent Demeester
84aa074d18 Merge pull request #24325 from Anvil/plugins_volume.md-unqiue 
Fixed typo: s/unqiue/unique/g
 2016-07-05 11:27:42 +02:00
Damien Nadé
777c387f1e Fixed typo: s/unqiue/unique/g 
Signed-off-by: Damien Nadé <github@livna.org>
 2016-07-05 11:16:24 +02:00
allencloud
baa3ca60d8 remove unnecessary err check and make some check better 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-07-05 11:06:57 +08:00
Charlie Drage
e29c77bff3 Add VARIANT and VARIANT_ID to os-release 
In order to provision different variant types such as embedded and
server releases, it's required to grep the VARIANT and VARIANT_ID
variables of os-release.

Specifically from this commit:
56267336c7

Which adds the VARIANT_ID="atomic.host" in order to differentiate
between Fedora Server and container-centric Atomic Host releases.

This commit adds the accessability of VARIANT and VARIANT_ID in order
for Docker Machine to successfully provision different variants of Fedora
releases.

Signed-off-by: Charlie Drage <charlie@charliedrage.com>
 2016-07-04 17:33:58 -04:00
Sebastiaan van Stijn
8fec3cf532 Merge pull request #78 from ShevYan/change-binary-path 
change the binary path in guide
 2016-07-02 00:25:55 -07:00
Sebastiaan van Stijn
e793ae929b Merge pull request #77 from ah3rz/patch-1 
fix typo 'software'
 2016-07-02 00:24:13 -07:00
Tibor Vass
91e29e815d Bump VERSION to v1.12.0-rc3 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-01 16:56:08 -07:00
Tibor Vass
da6da096b8 Merge pull request #24247 from tiborvass/fix-rpm-for-fedora24 
fix F24 rpm build
 2016-07-01 16:52:57 -07:00
Antonio Murdaca
0500446b36 fix F24 rpm build 
error: line 89: Invalid version (epoch must be unsigned integer):
%{epoch}:1.12.0-0.3.rc3.fc24: Requires(pre): docker-engine-selinux >=
%%{epoch}:1.12.0-0.3.rc3.fc24

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit 0c07e55e4c867ee034c72c7ff8a9b8d63a8ec17d)
 2016-07-01 16:51:47 -07:00
Alexandre Beslic
eb391fbff2 Merge pull request #2387 from sfsmithcha/update_readme_disambiguate_swarm 
include descriptions/links for various swarm projects
 2016-07-01 15:55:37 -07:00
Alexandre Beslic
519eabaca1 Merge pull request #2255 from allencloud/refresh_single_network_when_event_emitted 
Refresh single network when network event emitted
 2016-07-01 15:08:32 -07:00
Tibor Vass
ac499dc4bb Merge pull request #24231 from tiborvass/cherry-pick-containerd-race-fix 
Vendor containerd 1b3a81545ca79456086dc2aa424357be98b962ee
 2016-07-01 13:30:13 -07:00
Kenfe-Mickael Laventure
5199e3960e Vendor containerd 1b3a81545ca79456086dc2aa424357be98b962ee 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit 2685c82c2e1e75c1f7b39e8cb6e3d5acf258654d)
 2016-07-01 12:01:28 -07:00
Charles Smith
666792ebf7 include descriptions/links for various swarm projects 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-07-01 11:09:05 -07:00
Derek McGowan
4e17ab5d31 Merge pull request #1817 from cezarsa/master 
Avoid formatting errors with %#v
 2016-07-01 10:59:50 -07:00
Cezar Sa Espinola
e015cbadd6 registry: avoid formatting errors with %#v 
Signed-off-by: Cezar Sa Espinola <cezarsa@gmail.com>
 2016-07-01 11:30:58 -03:00