clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-28 09:00:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,828 Commits 9 Branches 112 Tags
eaecd8b1b5871a4d17be27e3615106587eec1d3a
Commit Graph
13828 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
sidharthamani eaecd8b1b5 add syslog driver 
Signed-off-by: wlan0 <sid@rancher.com>
 2015-03-21 18:01:18 -07:00
Alexander Morozov cf071bb962 Merge pull request #11450 from crosbymichael/rlimitfix 
Don't hardcode default rlimit
 2015-03-17 20:27:05 -07:00
Jessie Frazelle a5269223a7 Merge pull request #11320 from estesp/fix-daemon-startup 
Fix daemon shutdown on error after rework of daemon startup
 2015-03-17 19:04:25 -07:00
Michael Crosby f5a154f2d2 Don't hardcode default rlimit 
The default for rlimit handling should be to inherit the rlimit of the
daemon unless explicitly set.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-03-17 16:04:15 -07:00
Jessie Frazelle ef78cc0191 Merge pull request #11237 from thaJeztah/docs-remove-temporary-styles 
cleanup: docs: remove temporary inline styles
 2015-03-17 15:09:17 -07:00
Jessie Frazelle 8e6d0107df Merge pull request #11431 from jfrazelle/update-docs-image-on-make 
Update docs/base in makefile docs-build.
 2015-03-17 14:49:24 -07:00
Sebastiaan van Stijn 4e6a01023b cleanup: docs: remove temporary inline styles 
Some inline `<style>` tags were temporarily added to the documentation
because the documentation-stylesheets where not yet updated to the
latest version (see https://github.com/docker/docker/pull/11231 and
https://github.com/docker/docker/pull/11229#issuecomment-77698868).

This removes those temporary `<style>` tags.

depends on #11230 (https://github.com/docker/docker/issues/11230)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-03-17 22:48:28 +01:00
Phil Estes f42acd070a Merge pull request #11448 from vishh/port_log 
Reduce logging level for "ip_local_port_range" proc file in not accessible.
 2015-03-17 14:52:23 -04:00
Phil Estes 459e58ffc9 Fix daemon shutdown on error after rework of daemon startup 
Currently the daemon will not stop on error because the serve API job is
blocking the channel wait for daemon init.  A better way is to run the
blocking serve API job as a goroutine and make sure that error
notification gets back to the main daemon thread (using the already
existing channel) so that clean shutdown can occur on error.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2015-03-17 14:15:00 -04:00
James Turnbull c1639a7e4e Merge pull request #11355 from moxiegirl/11023-ubuntu-install 
Updating Ubuntu installation to use wget; eliminating elo
 2015-03-17 14:11:27 -04:00
Phil Estes e35c78a495 Merge pull request #11298 from brahmaroutu/gccgo_script 
Initial gccgo build script, requires host to contain gccgo 5.0
 2015-03-17 13:45:47 -04:00
Vishnu Kannan 39d49ba7ba Reduce logging level from error to warning if "/proc/sys/net/ipv4/ip_local_port_range" proc file in not accessible. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2015-03-17 17:39:17 +00:00
Jessie Frazelle c858cbffe0 Merge pull request #11444 from albers/bash-completion 
Updates to bash completion
 2015-03-17 10:25:46 -07:00
Mary Anthony f60ed98e79 # This is a combination of 2 commits. 
# The first commit's message is:

Updating Ubuntu installation to use wget; eliminating elo

Signed-off-by: Mary Anthony <mary.anthony@docker.com>

# This is the 2nd commit message:

Adding in James comments

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-03-17 10:15:46 -07:00
Tibor Vass ed66853697 Merge pull request #11447 from moxiegirl/black-to-back-fixes 
Fixing it back
 2015-03-17 13:09:16 -04:00
Mary Anthony 241579a34f Fixing it back 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-03-17 10:07:09 -07:00
moxiegirl 2ab105e9fe Merge pull request #11433 from moxiegirl/pick-up-tweaks-9882 
Return of the Ring: Metadata Labels Doc Tweaks
 2015-03-17 09:47:36 -07:00
Arnaud Porterie 1ff5a91007 Merge pull request #10568 from LK4D4/logging_drivers 
Logging drivers
 2015-03-17 09:45:58 -07:00
Arnaud Porterie a751cc53a7 Merge pull request #11118 from shishir-a412ed/restriction_username_length 
Docker Tag command: Relax the restriction on namespace (username) length from 30 to 255 characters.
 2015-03-17 09:41:12 -07:00
Harald Albers 04ca2c1f2b Updates to bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-03-17 17:07:10 +01:00
Arnaud Porterie cb77ad4757 Merge pull request #11369 from coolljt0725/fix_link 
Fix --link to a container which net mode is container
 2015-03-17 08:36:33 -07:00
Alexander Morozov 8685af0b13 Merge pull request #11401 from Mashimiao/11385-fix-lxc-conf-error 
fix not show error when using --lxc-conf without lxc driver
 2015-03-17 08:35:18 -07:00
Alexander Morozov aba193499e Merge pull request #11436 from sunyuan3/m1 
verify MaximumRetryCount for container restart policy
 2015-03-17 08:26:22 -07:00
Arnaud Porterie 0c3c645ad7 Merge pull request #11109 from ncdc/pull-by-digest 
Add support for referring to images by digest
 2015-03-17 08:15:45 -07:00
Lei Jitang 82e2e1a11a Fix --link to a container which net mode is container mode 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-03-17 07:50:12 -07:00
Andy Goldstein a2b0c9778f Add ability to refer to image by name + digest 
Add ability to refer to an image by repository name and digest using the
format repository@digest. Works for pull, push, run, build, and rmi.

Signed-off-by: Andy Goldstein <agoldste@redhat.com>
 2015-03-17 10:10:42 +00:00
Arnaud Porterie ad56b5c603 Merge pull request #11437 from duglin/FixLabels 
Some fixes for new LABEL stuff
 2015-03-16 23:39:59 -07:00
Doug Davis 6784a772ba Some fixed for new LABEL stuff 
- command.Commands was missing "Label"
- used the correct error string in dispatcher when LABEL has no args, otherwise
  the test TestBuildMissingArgs will not work
- removed the premature error msg in line_parser that was blocking the
  label() func in dispatcher from showing the err msg in previous bullet
- since LABEL uses the env parser it needs to be added to the replaceEnvAllowed
  list so that proper quote processing will be done.  Especially once
  PR #10431 is merged.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-03-16 22:53:41 -07:00
s00318865 173642c866 verify MaximumRetryCount for container restart policy 
Signed-off-by: s00318865 <sunyuan3@huawei.com>
 2015-03-17 13:20:25 +08:00
Mary Anthony 6ddfe883dd Updating with Sven's comments and other tweaks 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-03-16 21:49:33 -07:00
Arnaud Porterie b6ac111abf Merge pull request #9882 from ibuildthecloud/labels 
Proposal: One Meta Data to Rule Them All => Labels
 2015-03-16 20:20:05 -07:00
Jessie Frazelle ea25582d9f Merge pull request #10860 from mbentley/curl-install-fix 
Add 'extras' virtual package to fix kernel upgrade fallback from aufs to devicemapper
 2015-03-16 18:21:11 -07:00
James Turnbull 97a5c584b3 Merge pull request #11429 from tianon/eval-shellinit 
Add "eval" to every invocation of "boot2docker shellinit"
 2015-03-16 21:19:50 -04:00
Jessie Frazelle da24ba42e2 Merge pull request #11239 from thaJeztah/docs-tables-in-run-reference 
docs: use more tables in run reference and minor fixups
 2015-03-16 18:02:42 -07:00
Jessica Frazelle 6c492a2d05 Update docs/base in makefile docs-build. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2015-03-16 17:53:54 -07:00
Ma Shimiao 703cab12e7 fix not show error when using --lxc-conf without lxc driver 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-03-17 08:50:17 +08:00
Michael Crosby e6b18cb66d Merge pull request #11210 from xuhdev/patch-1 
Update doc: "docker create" must specify a command
 2015-03-16 17:43:17 -07:00
Tianon Gravi 200123b317 Add "eval" to every invocation of "boot2docker shellinit" 
See http://unix.stackexchange.com/a/181581 for the rationale behind this change.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-03-16 18:27:59 -06:00
Jessie Frazelle f4f10cf43b Merge pull request #11203 from rhatdan/Dockerfile 
We had some testers who found a hard to diagnose bug in Dockerfile
 2015-03-16 17:26:18 -07:00
Jessie Frazelle 44e9715e46 Merge pull request #10723 from SvenDowideit/takeover-10653 
Update sample systemd for container
 2015-03-16 17:18:57 -07:00
Jessie Frazelle c7f5ee9d69 Merge pull request #10816 from SvenDowideit/docker-build-return-code 
Add some information about the docker build return code
 2015-03-16 17:18:26 -07:00
Darren Shepherd fae92d5f0a Documentation changes for labels 
Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-03-16 17:08:40 -07:00
Jessie Frazelle 87a8658eb6 Merge pull request #11353 from mrunalp/override_default_mounts 
Filter out default mounts that are being overriden by the user.
 2015-03-16 16:40:32 -07:00
Michael Crosby 9422bc55fa Merge pull request #11332 from icecrime/windows_release 
Publish Windows binaries in release script
 2015-03-16 16:39:58 -07:00
Jessie Frazelle 213be9ee27 Merge pull request #11427 from LK4D4/fix_alloc_ip6 
Fix IPv6 autoallocation from mac with --ipv6-cidr
 2015-03-16 16:38:46 -07:00
Phil Estes d70c5cdcb9 Merge pull request #11426 from dmcgowan/registry-error-cleanup 
Quote registry error strings
 2015-03-16 19:27:41 -04:00
Michael Crosby c0b48ab70e Merge pull request #11411 from icecrime/contributing_squash 
Detail CONTRIBUTING.md regarding squashing
 2015-03-16 16:25:54 -07:00
Michael Crosby 88f437d6c6 Merge pull request #11402 from miminar/err-cleanup 
Error formatting cleanups
 2015-03-16 16:13:16 -07:00
Michael Crosby 8a6a5929a3 Merge pull request #11416 from mrunalp/update_libcontainer 
Update libcontainer to 52a8c004ca94cf98f6866536de828c71eb42d1ec
 2015-03-16 15:51:58 -07:00
Arnaud Porterie 241c371976 Publish Windows binaries in release script 
Windows client being official supported, publish Docker client Windows
binaries as part of the release.sh script.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-03-16 15:49:38 -07:00