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
Sebastiaan van Stijn
efb915800a Merge pull request #20649 from runcom/fedora-update-userns 
docs: reference: commandline: daemon: fedora 23+ has mapping files
 2016-02-24 16:04:02 +01:00
Sebastiaan van Stijn
b994cdd1f7 Merge pull request #58 from thaJeztah/update-libnetwork-maintainers 
Update libnetwork maintainers
 2016-02-24 15:56:46 +01:00
Sebastiaan van Stijn
5434b1723a Update libnetwork maintainers 
Chun Chen was added as a maintainer

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-02-24 15:43:57 +01:00
Antonio Murdaca
eb902ef257 docs: reference: commandline: daemon: fedora 23+ has mapping files 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-02-24 15:43:28 +01:00
Antonio Murdaca
afde6450ee resolve the config file from the sudo user 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-02-24 15:41:00 +01:00
Sebastiaan van Stijn
5fdfb2985b Merge pull request #20619 from Microsoft/jjh/useraccounts 
Windows: Updates for virtual user account
 2016-02-24 13:48:27 +01:00
Sebastiaan van Stijn
2cc54a2e57 Merge pull request #20643 from estesp/userns-chkconfig-redhat 
Add check for RHEL7/CentOS7 experimental userns disabled
 2016-02-24 11:42:26 +01:00
Sebastiaan van Stijn
034a1a8dfd Merge pull request #20017 from calavera/expose_volumes_in_ps 
Add mounts to docker ps.
 2016-02-24 11:08:21 +01:00
Qiang Huang
fa3b197157 Restore container configs when update failed 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-02-24 14:23:48 +08:00
Qiang Huang
8ae6f6ac28 Support update swap memory only 
We should support update swap memory without memory.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-02-24 13:36:47 +08:00
Phil Estes
2355151556 Add check for RHEL7/CentOS7 experimental userns disabled 
Add a check in `check-config.sh` to see if we are running on a RHEL7 or
CentOS7 system, which may report that CONFIG_USERNS is OK/enabled, but
user namespaces still won't work because of the experimental feature
flag added by Redhat.

This will add a warning if it is actually disabled and notes what has to
be added to the grub/boot command line to enable it.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2016-02-23 23:28:24 -06:00
Alexandre Beslic
a839ebdd06 Merge pull request #1864 from vieux/check_rm_resh 
make sure all the rescheduled containers were removed
 2016-02-23 21:14:11 -08:00
Nathan LeClaire
8046e13683 Merge pull request #1553 from jasisk/fix-conffile-error 
Fix apt-get error on conf file conflict
 2016-02-23 19:22:07 -08:00
Brian Goff
91fdfdd537 Revert "use pubsub instead of filenotify to follow json logs" 
This reverts commit b1594c59f5.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-02-23 21:43:52 -05:00
Brian Goff
f78091897a Revert "pkg: remove unused filenotify" 
This reverts commit ee99b5f2e9.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-02-23 21:43:46 -05:00
Brian Goff
d3bffa1639 Revert "vendor: remove fsnotify" 
This reverts commit bc195e1558.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-02-23 21:43:27 -05:00
Jean-Charles Sisk
b1999a7820 fix apt-get error on conf file conflict 
Signed-off-by: Jean-Charles Sisk <jasisk@gmail.com>
 2016-02-23 21:30:04 -05:00
Victor Vieux
8910c586f8 make sure all the rescheduled containers were removed 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-02-23 18:28:21 -08:00
Alexandre Beslic
a904eec54f Merge pull request #1863 from vieux/update_compose 
update compose to 1.6.2
 2016-02-23 17:42:26 -08:00
Aanand Prasad
9eb1204958 Merge pull request #3010 from aanand/bump-1.6.2 
Bump 1.6.2
 2016-02-23 17:02:34 -08:00
Nathan LeClaire
13bf5f5a47 Bump Toolbox for new Compose version 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-02-23 16:42:22 -08:00
Victor Vieux
a7a942192f update compose to 1.6.2 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-02-23 16:41:58 -08:00
Arnaud Porterie
2d0c3d1328 Merge pull request #20631 from LK4D4/update_libcontainer 
Update libcontainer to 2c3115481ee1782ad687a9e0b4834f89533c2acf
 2016-02-23 16:24:46 -08:00
John Howard
ef9f13af3d Windows CI: Fix TestStartAttachMultipleContainers 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-02-23 16:24:35 -08:00
Anusha Ragunathan
204c7808f9 Always create apt-ftparchive.conf. 
The Releases file(s) and other bits for EOL-ed distros such as Ubuntu
Vivid should remain untouched when we are releasing debs.

However, few files in https://apt.dockerproject.org/repo/dists/ubuntu-vivid/
were being updated for the docker 1.10 release including the Release files.
This is due to apt-ftparchive generating index files for vivid as well,
due to the stale apt-ftparchive.conf

This change always creates config using suites in contrib/reprepro/suites.sh.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-02-23 16:06:43 -08:00
Daniel Nephin
38dd342b7b Merge pull request #3009 from dnephin/update_release_notes 
Add release notes for 1.6.1
 2016-02-23 16:02:18 -08:00
Aanand Prasad
4d720279a0 Bump 1.6.2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-23 15:52:13 -08:00
Joffrey F
796dc91eb1 Update docker-py version in requirements to 1.7.2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 15:52:13 -08:00
Aanand Prasad
a7da06d920 Merge remote-tracking branch 'release/release' into bump-1.6.2 2016-02-23 15:49:21 -08:00
Joffrey F
f48d321b5b Merge pull request #3008 from shin-/update_dockerpy_version 
Update docker-py version in requirements to 1.7.2
 2016-02-23 15:41:11 -08:00
Arnaud Porterie
a9e6274224 Merge pull request #20627 from tophj-ibm/fix-flaky-oom-tests 
Fix flaky OOM tests
 2016-02-23 15:37:32 -08:00
Daniel Nephin
49ef8a271d Add release notes for 1.6.1 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 15:13:01 -08:00
Daniel Nephin
0467bc3dcf Merge pull request #2998 from londoncalling/docs-wordpress-example 
updated Wordpress example to be easier to follow, added/updated images
 2016-02-23 15:10:11 -08:00
Joffrey F
97bbee19b7 Update docker-py version in requirements to 1.7.2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 14:55:06 -08:00
Victor Vieux
02296dc1f2 Merge pull request #1855 from vieux/net_node_run 
support docker run --net <node>/<network>
 2016-02-23 14:22:49 -08:00
Morgan Bauer
67629c8b52 do not turn post-processing on for linux-cgo term 
- fixes #15373
 - remove set OPOST output flag for termios
 - remove latent os.Exit call

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2016-02-23 14:14:58 -08:00
Brian Bland
e430d77342 Merge pull request #1482 from stweil/master 
Fix some typos in comments and strings
 2016-02-23 14:08:21 -08:00
David Calavera
2ed1806b2c Merge pull request #20610 from justechn/fix_docs 
Fix docs
 2016-02-23 13:45:29 -08:00
Alexander Morozov
4fc5bd295e Update libcontainer to 2c3115481ee1782ad687a9e0b4834f89533c2acf 
It includes fix for parsing systemd cgroup names

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-02-23 13:37:20 -08:00
Stefan Weil
615c6dfced Fix some typos in comments and strings 
All of them were found and fixed by codespell.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-02-23 22:33:38 +01:00
John Howard
b368a9f9b7 Windows CI: Fixes panic in test-unit for FileUtils 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-02-23 13:31:45 -08:00
Riyaz Faizullabhoy
6d76ce10ba Merge pull request #577 from docker/walker-template 
WalkTargets on tuf repo for targets and delegations
 2016-02-23 13:19:54 -08:00
Victor Vieux
22fedf0db0 support docker run --net <node>/<network> 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-02-23 13:13:31 -08:00
Daniel Nephin
c1b7d6c6ad Merge pull request #3006 from dnephin/bump-1.6.1 
WIP: Bump 1.6.1
 2016-02-23 12:37:12 -08:00
Christopher Jones
3abf2a7741 Fix flaky OOM tests 
If cgroup swap memory limit isn't enabled, then
the -m flag doesn't work and the container that is created for
both of these tests is very large. Because we are trying to run the
containers out of memory, this takes a very long time and causes the
tests to fail most of the time.

Follow-up to #17913

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2016-02-23 15:26:26 -05:00
Daniel Nephin
a75c16cb1b Bump 1.6.1 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 12:08:56 -08:00
Mary Anthony
e08409f18d Updating Dockerfile 
Signed-off-by: Mary Anthony <mary@docker.com>
 2016-02-23 12:08:56 -08:00
Victoria Bialas
e6797e1166 updated Wordpress example to be easier to follow, added/updated images 
docs update per Mary's comments on the PR

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-02-23 11:59:19 -08:00
Daniel Nephin
f2ccbeff76 Merge pull request #2997 from dnephin/fix_env_var_without_value 
Fix env var without value
 2016-02-23 11:58:30 -08:00
Daniel Nephin
9d7dbe3857 Make environment variables without a value the same as docker-cli. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:58:16 -08:00