clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-08-23 15:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,441 Commits 9 Branches 112 Tags
994b7eaeb736c745442cae84126e30fa079e3dfe
Commit Graph

7441 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tianon Gravi 994b7eaeb7 Merge pull request #5201 from tianon/build-busybox 
Fetch the "busybox" image source so we can build locally instead of pulling during the integration tests
 2014-04-15 09:47:05 -06:00
Tianon Gravi de167a7514 Merge pull request #5181 from uggedal/mkimage-alpine 
contrib: mkimage script for alpine linux
 2014-04-15 08:09:42 -06:00
unclejack 8b54e57fa8 Merge pull request #5202 from vieux/allow_dot_repo 
Allow dot in repo name
 2014-04-15 13:58:33 +03:00
Eivind Uggedal 6a2bdc6eb7 contrib: mkimage script for alpine linux 
Docker-DCO-1.1-Signed-off-by: Eivind Uggedal <eivind@uggedal.com> (github: uggedal)
 2014-04-15 07:59:42 +00:00
Victor Vieux d61fce9af7 allow dot in repo name 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-04-14 23:15:38 +00:00
Tianon Gravi 7bb72fa080 Fetch the "busybox" image source so we can build locally instead of pulling during the integration tests 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-04-14 13:35:54 -06:00
Guillaume J. Charmes e5ad715e59 Merge pull request #5158 from vieux/refactor_build_only_configFile 
refactor build job to know only configFile
 2014-04-14 10:59:48 -07:00
Guillaume J. Charmes 19ffc5e92f Merge pull request #5075 from tianon/update-check-config 
Update check-config.sh with more kernel configs and more reliable cgroup hierarchy/subsystem check
 2014-04-14 10:58:00 -07:00
Victor Vieux 5fc1b4d2cd Merge pull request #5132 from crosbymichael/fix-cgroup-hiar 
Setup cgroups for supported subsystems
 2014-04-14 10:56:15 -07:00
Guillaume J. Charmes f98ed28c1d Merge pull request #4878 from kzys/freebsd-utimes 
Support FreeBSD on pkg/system/utimes_*.go
 2014-04-14 10:39:25 -07:00
Michael Crosby 413190e159 Merge pull request #5172 from pnasrat/5166-large-image-graph-restore 
Enable construction of TruncIndex from id array.
 2014-04-14 10:31:16 -07:00
Victor Vieux e9c3e39743 rename configFile to auth in the job 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-04-14 17:15:22 +00:00
unclejack 0037dee02c Merge pull request #5160 from kzys/fs-symlink 
Fix utils.FollowSymlinkInScope's infinite loops bug
 2014-04-14 20:12:39 +03:00
O.S. Tezer b255d96694 Merge pull request #4828 from almoehi/patch-1 
Added reactive-docker to list of remote API clients
 2014-04-14 19:06:59 +03:00
Paul Nasrat 84a76f2796 Add benchmark tests for TruncIndex. 
Compare add vs new.

Some historical data in PR #5172.

Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com> (github: pnasrat)
 2014-04-13 22:36:15 -04:00
Tianon Gravi 2d20c92d29 Merge pull request #5176 from unclejack/check_before_pulling 
cli integ: don't fetch busybox if it exists
 2014-04-13 09:28:30 -06:00
unclejack 449f92f11e cli integ: don't fetch busybox if it exists 
Don't make calls to the registry if the image exists already.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-04-13 15:06:15 +03:00
O.S. Tezer 370b935b49 Merge pull request #5177 from jbbarth/docs-add-common-errors-for-test-suite 
Docs: add some example log lines that indicate a lack of memory when running the test suite
 2014-04-12 21:03:24 +03:00
O.S. Tezer 1f7e97e951 Merge pull request #5178 from jbbarth/docs-improve-ubuntulinux-accounting-section 
Docs: improve installation/ubuntulinux memory and swap accounting section
 2014-04-12 20:32:26 +03:00
Jean-Baptiste Barth 0a0e49d406 Docs: improve installation/ubuntulinux memory and swap accounting section 
Docker-DCO-1.1-Signed-off-by: Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com> (github: jbbarth)
 2014-04-12 10:57:19 +00:00
Jean-Baptiste Barth 26845ef1ae Docs: add some example log lines that indicate a lack of memory when running the test suite 
Docker-DCO-1.1-Signed-off-by: Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com> (github: jbbarth)
 2014-04-12 02:09:06 +00:00
Kato Kazuyoshi 0f72486346 Fix utils.FollowSymlinkInScope's infinite loop bug 
fs_test.go doesn't finish if Docker's code is placed under a directory
which has symlinks between / and the directory.
For example, the below doesn't finish before the change.

  /home -> usr/home
  FollowSymlinkInScope("/home/bob/foo/bar", "/home/bob/foo")

Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
 2014-04-12 07:37:18 +09:00
Kato Kazuyoshi e3e078ca2f Add the test to reproduce the issue even in "make test" 
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
 2014-04-12 07:37:17 +09:00
Paul Nasrat 4f169c2db5 Enable construction of TruncIndex from id array. 
Fixes #5166

Current graph.restore is essentially O(n^2 log n) due to how
suffixarray creation works.

Rather than create/append/create new this supports creation from a seed
array of ids.

Functional testing shows this eliminates the hang on Creating image
graph reported on list.

Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com> (github: pnasrat)
 2014-04-11 16:39:58 -04:00
Alexander Larsson 4ddfffcab3 Join memory and cpu cgroup in systemd too 
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: crosbymichael)
 2014-04-11 17:29:40 +00:00
Michael Crosby 505184d2dc Join cpuacct, freezer, perf_event, and blkio groups 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-04-11 17:28:27 +00:00
Michael Crosby 031fcb31d3 Setup cgroups for all subsystems 
Fixes #5117
Fixes #5118
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-04-11 17:28:27 +00:00
James Turnbull 931f065560 Merge pull request #5164 from jsimonelis/patch-2 
terms update: FQIN must include a tag
 2014-04-11 06:47:28 -07:00
Justin Simonelis 69fbf8e31f terms update: FQIN must include a tag 
change: A fully qualified image name must include a tag.

Recommitting changes for PR: https://github.com/dotcloud/docker/pull/5145
since SvenDowideit suggested I would need to sign my commit for it to be accepted.

Docker-DCO-1.1-Signed-off-by: Justin Simonelis <justin.p.simonelis@gmail.com> (github: jsimonelis)
 2014-04-11 08:51:50 -04:00
Victor Vieux b9731bccf2 refactor build job to know only configFile 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-04-10 22:29:03 +00:00
Tianon Gravi 28e7e81479 Merge pull request #5072 from tianon/hack-set-e-consistently 
Update bundlescripts to use "set -e" consistently
 2014-04-10 13:37:36 -06:00
Tianon Gravi feae37c171 Merge pull request #5071 from tianon/minor-man-formatting-consistency 
Fix a few minor man formatting consistency issues
 2014-04-10 13:13:37 -06:00
Victor Vieux f66082a443 Merge pull request #5093 from danielnorberg/do-not-create-bridge 
net: do not create -b/--bridge specified bridge
 2014-04-10 11:17:02 -07:00
Victor Vieux bcc3857fa0 Merge pull request #4990 from vbatts/vbatts-server_show_info 
docker daemon: show info about the server
 2014-04-10 11:14:09 -07:00
Victor Vieux b8c10d8af2 Merge pull request #5143 from kzys/ns-nil 
Avoid "invalid memory address or nil pointer dereference" panic
 2014-04-10 11:07:35 -07:00
O.S. Tezer a521388863 Merge pull request #4821 from jimenez/3903-add_event_end_timestamp-feature 
Adding timestamp end to events endpoint. Modifying api docs.
 2014-04-10 20:54:53 +03:00
Victor Vieux 897bf5439d Merge pull request #5140 from unclejack/build_immediate_cleanup 
delete containers during build after every step
 2014-04-10 10:49:13 -07:00
Isabel Jimenez 66dd4ea4e2 Adding timestamp end to events endpoint. Modifying api docs. 
Docker-DCO-1.1-Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com> (github: jimenez)
 2014-04-10 10:43:21 -07:00
Daniel Norberg d4746d3ea0 bridge driver: clean up error returns 
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)
 2014-04-10 11:26:48 -04:00
Daniel Norberg 336199a877 net: do not create -b/--bridge specified bridge 
If the bridge specified using -b/--bridge doesn't
exist, fail instead of attempting to create it.

This is consistent with the docker documentation
on -b/--bridge: "Attach containers to a pre
existing network bridge". 

It is also less surprising in an environment where
the operator expected the bridge to be properly
set up before docker starts and expects docker to
fail fast if the bridge was not up instead of
masking this error and coming up in some
potentially broken state.

With this patch, docker still creates docker0 if
needed and no bridge was explicitly specified.

Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)
 2014-04-10 11:11:17 -04:00
Guillaume J. Charmes 7dd9c208fd Merge pull request #5069 from tianon/hack-make-ubuntu-man 
Add contrib/man to our generated deb
 2014-04-10 08:04:04 -07:00
Guillaume J. Charmes 4a88e111d0 Merge pull request #5087 from vbatts/vbatts-save_permissions 
docker save: fix filemode permissions
 2014-04-10 08:00:37 -07:00
Guillaume J. Charmes 042a50a8fe Merge pull request #5131 from crosbymichael/shm-mode 
Change shm mode to 1777
 2014-04-10 07:50:32 -07:00
Guillaume J. Charmes 5b242c95da Merge pull request #5115 from alexlarsson/fix-libcontainer-network-rhel6 
Fix libcontainer network support on rhel6
 2014-04-10 07:45:12 -07:00
Guillaume J. Charmes ec9190cdd2 Merge pull request #5133 from crosbymichael/revert-hairpin 
Revert "Support hairpin NAT without going through docker server"
 2014-04-10 07:06:35 -07:00
James Turnbull 49e87d1932 Merge pull request #5050 from SvenDowideit/add-some-words-to-cli 
add some more text to the cli docs
 2014-04-10 07:05:19 -07:00
James Turnbull 0bc479c48b Merge pull request #5109 from jonathanpa/master 
Update mac.rst to add homebrew instructions.
 2014-04-10 06:42:54 -07:00
Kato Kazuyoshi c5226d94fa Avoid "invalid memory address or nil pointer dereference" panic 
libcontainer.GetNamespace returns nil on FreeBSD because
libcontainer.namespaceList is empty. In this case, Namespaces#Get should
return nil instead of being panic.

Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
 2014-04-10 22:07:29 +09:00
Sven Dowideit e625cee28d add some more text to the cli docs 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
 2014-04-10 12:52:46 +00:00
unclejack 7931be5cba delete containers during build after every step 
This commit changes the way docker build cleans up containers.
Containers get cleaned up right away after they've been committed and
they've become an image.

When the build fails, only the last container of the failing step is
left behind.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-04-10 14:46:42 +03:00