clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-28 17:10:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,265 Commits 9 Branches 112 Tags
50905a6d6ce2fdd1ab0c33ec0b7a26895e0cbeea
Commit Graph
12265 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Morozov 50905a6d6c Update libcontainer to 1597c68f7b941fd97881155d7f077852e2914e7b 
This commit contains changes for docker:
* user.GetGroupFile to user.GetGroupPath docker/libcontainer#301
* Add systemd support for OOM docker/libcontainer#307
* Support for custom namespaces docker/libcontainer#279, docker/libcontainer#312
* Fixes #9699 docker/libcontainer#308

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2014-12-23 12:10:03 -08:00
Alexander Morozov 043e33c2c1 Merge pull request #9757 from lindenlab/9712-validTagName-errormessage 
Fixing ValidateTagName error message #9712
 2014-12-22 21:17:03 -08:00
Jessie Frazelle 034ba8b88f Merge pull request #9765 from thaJeztah/improve-error-message-3036 
Improve error message for conflicting container name.
 2014-12-22 18:02:48 -08:00
Sven Dowideit 7a3efc9aa5 Merge pull request #9783 from SvenDowideit/pr_out_debian_wheezy_backports_kernel_updated_to_3_16 
Debian Wheezy backports kernel updated to 3.16
 2014-12-23 11:19:26 +10:00
panticz 973c3c768b Debian Wheezy backports kernel updated to 3.16 
Replaces #9723

fix by: panticz <mail@konczalski.de> (github: panticz)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
 2014-12-23 11:14:14 +10:00
Sven Dowideit 197281f585 Merge pull request #9740 from SvenDowideit/pr_out_fixes_as_requested 
Login with PUTTY instead of using the CMD
 2014-12-23 11:11:53 +10:00
Sven Dowideit db165f7d2c fixes as requested 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2014-12-23 11:06:45 +10:00
Krasimir Georgiev 948f33263e Changing the windows installation doc to include instructions how to login 
using putty instead of CMD

Signed-off-by: Krasimir Georgiev <support@vip-consult.co.uk>

Docker-DCO-1.1-Signed-off-by: Krasimir Georgiev <support@vip-consult.co.uk> (github: SvenDowideit)
 2014-12-23 11:06:44 +10:00
Sven Dowideit dda2b19439 Merge pull request #9782 from SvenDowideit/pr_out_update_debian_version_to_7_7 
Update Debian version to 7.7
 2014-12-23 11:02:50 +10:00
panticz 491ff81a0b Update Debian version to 7.7 
Replaces #9724

fix by: panticz <mail@konczalski.de> (github: panticz)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
 2014-12-23 10:53:36 +10:00
Jessie Frazelle 9f6feaa3c3 Merge pull request #9781 from mota/deadfunc-vfs-driver 
Cleanup: Remove unused function from vfs storage driver
 2014-12-22 16:17:53 -08:00
Pierre Wacrenier c1e04fbb15 Remove unused function from vfs storage driver 
Signed-off-by: Pierre Wacrenier <pierre.wacrenier@gmail.com>
 2014-12-23 00:36:20 +01:00
Jessie Frazelle d09421a74f Merge pull request #9615 from unclejack/bump_go_to_1.4 
bump Go to 1.4
 2014-12-22 15:07:57 -08:00
Alexander Morozov 04117e4021 Merge pull request #7003 from porjo/6034-fowardChain 
Move per-container forward rules to DOCKER chain
 2014-12-22 14:40:42 -08:00
Jessie Frazelle b1cf41d952 Merge pull request #9750 from icecrime/9652_revert_doc 
Revert doc changes from #9652
 2014-12-22 12:43:51 -08:00
Jessie Frazelle 4d0fcb64d2 Merge pull request #9284 from icecrime/client_only_integration_tests 
Enable test-integration-cli for Windows platform
 2014-12-22 12:32:48 -08:00
Alexander Morozov 67e34350b7 Merge pull request #9742 from yadutaf/master 
Start new API v1.17 docs
 2014-12-22 11:31:08 -08:00
unknown aa9c9569c2 Improve error message for conflicting container name. 
This changes the error message that is returned by the daemon when
a container-name already exists.

The old message suggests that containers can be renamed, which is
currently not possible.

To prevent confusion, the part "(or rename)" is removed from
the error-message.

Message before this change;

    FATA[0000] Error response from daemon: Conflict, The name foobar is already assigned to 728ac36fb0ab. You have to delete (or rename) that container to be able to assign foobar to a container again.

Message after this change;

    FATA[0000] Error response from daemon: Conflict. The name 'foobar' is already in use by container 728ac36fb0ab. You have to delete that container to be able to reuse that name.

Relates to: https://github.com/docker/docker/issues/3036

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2014-12-22 09:59:08 +01:00
Jean-Tiare Le Bigot 800a8e896e start new API v1.17 docs 
Signed-off-by: Jean-Tiare Le Bigot <jt@yadutaf.fr>
 2014-12-22 09:01:33 +01:00
Alexander Morozov a31c14cadc Fix TestBuildWithTabs for go 1.4 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2014-12-21 13:49:45 +02:00
Alexander Morozov 6ac802ecd8 Reinstall standard library with netgo 
Fixes #9449

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2014-12-21 13:49:45 +02:00
unclejack 62e8a93c34 bump Go to 1.4 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2014-12-21 13:49:45 +02:00
Ian Bishop 38a595aec5 Tidy driver.go/LinkContainers 
Docker-DCO-1.1-Signed-off-by: Ian Bishop <ianbishop@pace7.com> (github: porjo)
 2014-12-21 13:42:02 +10:00
Ian Bishop 137ceae913 Update networking.md with new iptables behaviour 
Docker-DCO-1.1-Signed-off-by: Ian Bishop <ianbishop@pace7.com> (github: porjo)
 2014-12-21 12:57:32 +10:00
Ian Bishop 0da92633b4 Create tests for pkg/iptables 
Docker-DCO-1.1-Signed-off-by: Ian Bishop <ianbishop@pace7.com> (github: porjo)
 2014-12-21 12:57:32 +10:00
Porjo 2865373894 Create DOCKER forward chain on driver init 
Docker-DCO-1.1-Signed-off-by: Ian Bishop <ianbishop@pace7.com> (github: porjo)
 2014-12-21 12:57:32 +10:00
Porjo cc89b30d35 Move per-container forward rules to DOCKER chain 
Docker-DCO-1.1-Signed-off-by: Ian Bishop <ianbishop@pace7.com> (github: porjo)
 2014-12-21 12:57:32 +10:00
Arnaud Porterie f3ed42286e Enable test-integration-cli for Windows platform 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2014-12-20 16:40:40 -08:00
Don Kjer b74ccf2a1b Fixing ValidateTagName error message 
Signed-off-by: Don Kjer <don.kjer@gmail.com>
 2014-12-19 22:48:31 +00:00
Alexander Morozov 0874f9ab77 Merge pull request #9741 from tianon/test-docker-py 
Add docker-py integration tests aginst the docker daemon
 2014-12-19 11:57:35 -08:00
Tibor Vass b88d9699ff Merge pull request #9735 from tiborvass/fix-issecure-for-http-proxies 
Handle unresolvable domain names in isSecure to allow HTTP proxies to work as expected
 2014-12-19 14:53:48 -05:00
Tianon Gravi 100267de81 Tweak test-docker-py feature 
- move docker/docker-py clone to the Dockerfile
- put "integration test daemon startup" code in a separate file for both scripts to source
- add new test-docker-py Makefile target
- include "python-websocket" package in Dockerfile for running the tests

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2014-12-19 10:47:01 -07:00
Tibor Vass 13250569f6 Merge pull request #9751 from unclejack/revert_9233 
Fix pkg/units compilation of size_test
 2014-12-19 11:56:23 -05:00
unclejack e59aad9cd3 pkg/units: fix size_test.go compilation 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2014-12-19 18:38:12 +02:00
Arnaud Porterie edb75b486e Revert doc changes from #9652 
Because the patch is not in 1.4, the v1.16 docs shouldn't have been
updated. Docs were promoted to v1.17 by #9742.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2014-12-19 08:13:33 -08:00
Tibor Vass f7a449f92b Merge pull request #9746 from unclejack/graphdb_fix 
pkg/graphdb: use transactions for transactions
 2014-12-19 11:11:59 -05:00
unclejack e9f37a0118 pkg/graphdb: use transactions for transactions 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2014-12-19 13:57:21 +02:00
Michael Crosby 2acb856dff Merge pull request #9233 from inatatsu/fix-pkg-units-size-for-gccgo 
Fix to avoid a compile error due to float to int truncation with GCCGO
 2014-12-18 18:33:01 -08:00
Michael Crosby d6d2ff4df7 Merge pull request #9738 from jfrazelle/da-fuk-merge 
Repeated word typo.
 2014-12-18 18:30:04 -08:00
James Turnbull 3e3749fe4b Merge pull request #9657 from moxiegirl/9655 
Clarify Mac OS X experience. Signed-off by: Mary Anthony (moxieandmore@g...
 2014-12-18 21:29:02 -05:00
Jessica Frazelle 29ed8a2289 I don't know how this happened, repeated word typo. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-12-18 18:09:41 -08:00
Tibor Vass ff4bfcc0e9 registry: handle unresolvable domain names in isSecure 
to allow HTTP proxies to work as expected.

Fixes #9708

Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-12-18 19:16:55 -05:00
Tibor Vass a70d7aaf28 registry: add tests for unresolvable domain names in isSecure 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-12-18 19:16:55 -05:00
Tibor Vass 610842f906 Merge pull request #8827 from jlhawn/build_implied_from_scratch 
Make `FROM scratch` a special cased 'no-base' spec
 2014-12-18 18:21:16 -05:00
Josh Hawn 8936789919 Make FROM scratch a special cased 'no-base' spec 
There has been a lot of discussion (issues 4242 and 5262) about making
`FROM scratch` either a special case or making `FROM` optional, implying
starting from an empty file system.

This patch makes the build command `FROM scratch` special cased from now on
and if used does not pull/set the the initial layer of the build to the ancient
image ID (511136ea..) but instead marks the build as having no base image. The
next command in the dockerfile will create an image with a parent image ID of "".
This means every image ever can now use one fewer layer!

This also makes the image name `scratch` a reserved name by the TagStore. You
will not be able to tag an image with this name from now on. If any users
currently have an image tagged as `scratch`, they will still be able to use that
image, but will not be able to tag a new image with that name.

Goodbye '511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158',
it was nice knowing you.

Fixes #4242

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2014-12-18 14:03:38 -08:00
Vincent Batts 502a1a4e1a Merge pull request #9733 from unclejack/disable_tarsum_logging 
pkg/tarsum: delete the logging code
 2014-12-18 16:54:59 -05:00
unclejack e7c0587d54 pkg/tarsum: delete the logging code 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2014-12-18 23:38:26 +02:00
Tianon Gravi 1531bf48aa Merge pull request #9688 from dqminh/fix-make-tgz 
make.sh tgz should handle windows binary
 2014-12-18 13:16:32 -08:00
Michael Crosby e850568bf6 Merge pull request #9720 from jlhawn/apply_diff_optimize 
Refactor to optimize storage driver ApplyDiff()
 2014-12-18 11:58:47 -08:00
Mary Anthony 801fd1af25 Argghhh...I need to automate that signoff. Fixing lack of signoff 
Signed-off-by: Mary Anthony <moxieandmore@gmail.com>
 2014-12-18 09:10:08 -08:00