centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-05 10:48:55 +07:00
Code Issues Packages Projects Releases Wiki Activity
10,228 Commits 56 Branches 28 Tags
bb36902db60d5d4e3b18bc018212e40df2d412e8
Commit Graph

10228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Hollensbe
bb36902db6 builder: rewrote NewBuildFile according to tibor's comments 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-08-27 18:52:29 -07:00
Erik Hollensbe
22c46af4b3 builder: parser and beginnings of the evaluator 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-08-27 18:52:29 -07:00
Michael Crosby
334dca15b0 Merge pull request #7647 from ewindisch/erw-tarsum-maintainer 
Add Eric Windisch to MAINTAINER for tarsum
 2014-08-27 20:00:19 -07:00
Michael Crosby
2a5e29adc6 Merge pull request #7677 from erikh/update_hosts_linked_containers 
Update /etc/hosts when linked container is restarted
 2014-08-27 19:54:09 -07:00
Michael Crosby
77eefbc688 Merge pull request #7672 from cpuguy83/cleanup_volumes_from 
Cleanup: applyVolumesFrom
 2014-08-27 19:43:16 -07:00
Michael Crosby
345e3811fe Merge pull request #7767 from vieux/move_some_tests 
Move some tests
 2014-08-27 19:28:31 -07:00
Erik Hollensbe
f6a2fc4c33 Update networking doc with clarified text regarding links usage 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-08-27 18:23:41 -07:00
Erik Hollensbe
9f09ef18a4 pkg/networkfs/etchosts: tests for Update method 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-08-27 18:23:41 -07:00
Erik Hollensbe
925a3254e7 pkg/graphdb: tests for Parents and Children 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-08-27 18:23:41 -07:00
Victor Vieux
450740c891 Update /etc/hosts when linked container is restarted 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-08-27 18:23:41 -07:00
Victor Vieux
2b538bd555 remove auth_test.go 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-08-28 00:28:54 +00:00
Victor Vieux
5b27fbc0e2 move TestEntrypoint & TestBindMounts 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-08-28 00:25:10 +00:00
Victor Vieux
96e1c99fb4 Merge pull request #7708 from SvenDowideit/programatic-usage-options 
add the [OPTIONS] string automatically if there are flags defined
 2014-08-27 16:40:17 -07:00
Victor Vieux
eb9379c5d0 move TestKillDifferentUser 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-08-27 23:34:37 +00:00
Sven Dowideit
7c27c7a096 Merge pull request #7766 from fredlf/update_b2d_upgrading 
Updating B2D upgrade instructions for 1.2.0.
 2014-08-27 15:53:48 -07:00
SvenDowideit
8c6c4a12b7 add the [OPTIONS] string automatically if there are flags defined 
Signed-off-by: SvenDowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-08-28 08:50:50 +10:00
Victor Vieux
0cb672e6a9 Merge pull request #7762 from LK4D4/skip_delete_no_chain_#6904 
Skip "no chain" error on deleting chain in Unmap
 2014-08-27 14:43:57 -07:00
Fred Lifton
3304d4e984 Updating B2D upgrade instructions for 1.2.0. 
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
 2014-08-27 14:16:29 -07:00
Michael Crosby
e0db426ff6 Merge pull request #7764 from vieux/revert 
Revert "--help option and help command should print to stdout not stderr"
 2014-08-27 12:02:02 -07:00
Victor Vieux
2e489073d9 Revert "--help option and help command should print to stdout not stderr" 
This reverts commit 61b129d818.

Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-08-27 18:59:13 +00:00
Michael Crosby
835800fcd5 Merge pull request #7686 from guywithnose/trancateNames 
Truncate the names list on ps
 2014-08-27 11:46:28 -07:00
Robert Bittle
d2ffcd986f Truncate the names list on ps 
Signed-off-by: Robert Bittle <guywithnose@gmail.com>
 2014-08-27 14:24:49 -04:00
Victor Vieux
76fd51a478 Merge pull request #6052 from rhatdan/help 
--help option and help command should print to stdout not stderr
 2014-08-27 11:17:16 -07:00
Alexandr Morozov
bd049b3800 Skip "no chain" error on deleting chain in Unmap 
Fixes #6904
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-27 20:24:27 +04:00
Michael Crosby
1385b2d293 Merge pull request #7740 from LK4D4/registry_style 
Style fixes for registry/registry.go
 2014-08-26 18:02:11 -07:00
Brian Goff
7495fbc0e3 Cleanup: applyVolumesFrom 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
 2014-08-26 20:52:58 -04:00
James Turnbull
4fe6115fb1 Merge pull request #7741 from LK4D4/bump_docs_to_1.15 
Bump docs and api to 1.15
 2014-08-26 13:44:05 -07:00
James Turnbull
5b6c25f751 Merge pull request #7735 from SvenDowideit/lxcconf-api-docs 
Lxcconf api docs
 2014-08-26 13:43:48 -07:00
Michael Crosby
b458dd1dfb Merge pull request #7745 from LK4D4/fix_docker_host_panic 
Fix panic for DOCKER_HOST without ://
 2014-08-26 11:23:30 -07:00
Tibor Vass
c4a190db0c Merge pull request #7744 from LK4D4/fix_race_cleanup_start_#6904 
Fix race condition between cleanup and Start
 2014-08-26 14:17:11 -04:00
Michael Crosby
55f7dd8198 Merge pull request #7642 from LK4D4/style_fixes 
Style fixes for daemon package
 2014-08-26 10:59:05 -07:00
Michael Crosby
89f64712fa Merge pull request #7702 from LK4D4/fix_panic_on_bad_device_#7701 
Handle error from GetDevice early
 2014-08-26 10:53:40 -07:00
Alexandr Morozov
12ff89a390 Fix race condition between cleanup and Start 
There was problem when Start might be before cleanup

Fixes #6904

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-26 20:57:12 +04:00
Alexandr Morozov
660cc4a267 Fix panic for DOCKER_HOST without :// 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-26 20:32:10 +04:00
Tibor Vass
63ed18ad11 Merge pull request #7615 from crosbymichael/fix-utils-panic 
Fix panic in validate context for build
 2014-08-26 10:30:42 -04:00
Alexandr Morozov
e261618b24 Bump docs and api to 1.15 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-26 13:08:50 +04:00
Alexandr Morozov
45a2923874 Style fixes for registry/registry.go 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-26 12:28:40 +04:00
Alexandr Morozov
698392cb51 Remove redundant elses 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-26 09:28:54 +04:00
Alexandr Morozov
1ba15b8aca Use ++ instead of += 1 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-26 09:27:07 +04:00
SvenDowideit
b0edced87f Fix the other API docs to use an array of key/values 
as per #7706

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-08-26 11:36:25 +10:00
getvictor
216ab880f9 Updating LxcConf to match Docker command line 
I've changed LxcConf on a previous API document. Not sure why it keeps getting changed back. I'm seeing Docker 1.2.0 command-line calls are still using the array of key/values.

Docker-DCO-1.1-Signed-off-by: getvictor <victor@victoreda.com> (github: SvenDowideit)
 2014-08-26 11:36:25 +10:00
Sven Dowideit
a05d8d4f4f Merge pull request #7733 from Djelibeybi/oraclelinux-docs 
Oracle Linux docs
 2014-08-25 18:14:36 -07:00
Avi Miller
fcad8ee83a Add Oracle Linux specific documentation for installation of Docker from Oracle Linux repositories on Oracle Linux 6 and 7. 
Signed-off-by: Avi Miller <avi.miller@oracle.com>
 2014-08-26 11:10:09 +10:00
Sven Dowideit
849086d3d9 Merge pull request #7732 from SvenDowideit/ubuntu-backported-kernel 
Ubuntu backported kernel
 2014-08-25 17:16:34 -07:00
SvenDowideit
93d574298d small word change 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-08-26 10:15:12 +10:00
Sven Dowideit
97c7b0115b Merge pull request #7603 from kuon/centos7 
Added manual installation instruction for Centos7 and note about firewalld.
 2014-08-25 16:49:09 -07:00
Michael Crosby
b0abd6de63 Merge pull request #7574 from crosbymichael/update-restart-docs 
Update flag usages and docs for max restart count
 2014-08-25 16:26:06 -07:00
Michael Crosby
2bdfbab23d Merge pull request #7622 from rajdeepd/master 
Added Test case for Engine shutdown
 2014-08-25 15:57:11 -07:00
Michael Crosby
228eda4fd5 Merge pull request #7629 from LK4D4/fix_follow_hang_on_stop 
Fix logs -f hanging on stopped containers
 2014-08-25 15:24:20 -07:00
Michael Crosby
7556a42453 Merge pull request #7716 from coolljt0725/master 
Fix the bug of docker import command when import a image with a tag use format 'URL|- [REPOSITORY[:TAG]]'
 2014-08-25 15:11:50 -07:00