clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-04 07:48:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,878 Commits 9 Branches 112 Tags
ed55a2db06c7343f00a71844b166da1bbfbb812d
Commit Graph
10878 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandr Morozov aa536b27a7 Use prefix naming for docker_cli_run_test.go 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-19 21:56:24 +04:00
Ben Firshman e1b968f198 Add support for multiple level CLI commands 
E.g. "docker groups create" will attempt to call the function
CmdGroupsCreate

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-09-19 10:43:50 -07:00
Phil Estes be6bce6ab8 Fix container wait error message to match server template for returning 404 
Addresses #8107

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2014-09-19 13:33:00 -04:00
Jyrki Puttonen 1d2a1598c5 Fix detaching from attached container 
Text was copied from man-pages https://raw.githubusercontent.com/docker/docker/master/docs/man/docker-attach.1.md

Signed-off-by: Jyrki Puttonen <jyrkiput@gmail.com>
 2014-09-19 19:34:05 +03:00
Guillaume Dufour acea488eb6 FIX 6613:launch docker fail with space named drive 
Signed-off-by: Guillaume Dufour <guillaume.duff@gmail.com>
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-09-19 12:07:53 -04:00
Erik Hollensbe e91de29e08 Merge pull request #8076 from duglin/MultiCopyAdd 
Add support for copy/add with multiple src files
 2014-09-19 09:01:29 -07:00
Bruno Binet d78936b418 Automatically clean up hello-world container with --rm 
Signed-off-by: Bruno Binet <bruno.binet@gmail.com>
 2014-09-19 12:22:39 +02:00
Sven Dowideit 39ed048aab Merge pull request #8091 from jfrazelle/exec-main-manpage 
Add docker-exec to main manpage
 2014-09-19 16:17:11 +10:00
James Turnbull 742eb7e001 Merge pull request #8116 from SvenDowideit/use-boot2docker-shellinit 
boot2docker shellinit will set any and all env vars needed.
 2014-09-19 00:46:15 -04:00
Doug Davis 05b8a1eb36 Add support for copy/add with multiple src files 
Part one of solution for issue #6820

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2014-09-18 20:12:13 -07:00
Michael Crosby 72e9015591 Merge pull request #7694 from eyakubovich/master 
Add an option to disable IP masquerading
 2014-09-18 18:33:45 -07:00
Michael Crosby d5537e0f03 Merge pull request #6950 from jfrazelle/6831-check-flag-centos6.5 
Fix duplicate iptables rules
 2014-09-18 17:51:15 -07:00
Sven Dowideit 82aa895c6d Merge pull request #8061 from SvenDowideit/document-image-tarball-format 
Add a little description of the image tarball format.
 2014-09-19 10:32:13 +10:00
Jessie Frazelle 031231b5ed Merge pull request #8111 from acroca/master 
Grammar fix
 2014-09-18 17:27:24 -07:00
Sven Dowideit 7797572249 boot2docker shellinit will set any and all env vars needed. 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2014-09-19 10:20:12 +10:00
Albert Callarisa 4e11902d05 'an file' -> 'a file' grammar fix 
Signed-off-by: Albert Callarisa Roca <albert@acroca.com>
 2014-09-19 08:12:33 +08:00
Alexandr Morozov e909bbccc3 Merge pull request #8115 from vishh/exec_panic_fix 
Initialize execStore while restoring a container from checkpoint.
 2014-09-19 02:22:51 +04:00
Jessica Frazelle 42dafe4bd8 test for panic on daemon restart 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-09-18 21:54:42 +00:00
Vishnu Kannan 003afaf1ce Initialize execStore while restoring a container from checkpoint. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-09-18 21:40:53 +00:00
Vincent Batts 4e9925d780 tarsum: allow for alternate block ciphers 
Not breaking the default cipher and algorithm for calculating checksums,
but allow for using alternate block ciphers during the checksum
calculation.

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
 2014-09-18 10:34:58 -04:00
Steven Merrill 640d2ef6f5 Try to avoid issues when the Docker daemon restarts. 
This change will allow the Docker daemon's init script to wait up to 5
minutes before being forcibly terminated by the initscript. Many
non-trivial containers will take more than the default 3 seconds to
stop, which can result in containers whose rootfs is still mounted and
will not restart when the daemon starts up again, or worse, orphan
processes that are still running.

Signed-off-by: Steven Merrill <steven.merrill@gmail.com>
 2014-09-18 08:21:00 -04:00
unclejack db5edfb748 Merge pull request #8105 from LK4D4/build_test_little_fix 
Little fixes in cli build tests
 2014-09-18 10:32:10 +03:00
Alexandr Morozov 184fe67bbc Add Build prefix to Copy tests 
Now we can do "-run TestBuild" to test all build-tests and "-run
TestBuildCopy" for test all copy-tests

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-18 09:09:10 +04:00
Alexandr Morozov aa0449c813 Fix logDone message for TestCopySingleFileToExistDir 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-18 09:02:05 +04:00
Frederick F. Kautz IV 3bb12d390a Adding additional documentation for fixed-cidr networking 
Docker-DCO-1.1-Signed-off-by: Frederick F. Kautz IV <fkautz@alumni.cmu.edu> (github: fkautz)

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-18 08:48:24 +04:00
Sven Dowideit db9f8ba55c Add a little description of the image tarball format. 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2014-09-18 10:40:55 +10:00
Sven Dowideit e9b5acba4b Merge pull request #8081 from abh1nav/master 
Update remote_api_client_libraries.md
 2014-09-18 10:24:53 +10:00
Sven Dowideit c7c78acf81 Merge pull request #8025 from davidpelaez-forks/docs-fix 
Improved X-Registry-Auth content instructions
 2014-09-18 09:54:25 +10:00
Michael Crosby f8be5f586f Merge pull request #8097 from erikh/builder_maintainers 
Add a new MAINTAINERS file for the builder.
 2014-09-17 15:42:34 -07:00
Erik Hollensbe 1ff1befd12 Add a new MAINTAINERS file for the builder. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-09-17 15:36:04 -07:00
Michael Crosby 77d30e7112 Merge pull request #8041 from unclejack/lower_allocations_broadcastwriter 
lower the number of allocations in broadcastwriter
 2014-09-17 15:26:44 -07:00
Tibor Vass 12f522ac65 Merge pull request #8095 from jfrazelle/cp-parse-subcommand-rebase 
Removed runconfig.ParseSubcommand
 2014-09-17 18:04:28 -04:00
Oh Jinkyun 9aa71549d6 Removed runconfig.ParseSubcommand 
Removed runconfig.ParseSubcommand, changed it to runconfig.Parse and editted related tests and modules

Signed-off-by: Oh Jinkyun <tintypemolly@gmail.com>
 2014-09-17 14:38:22 -07:00
unclejack 458b019e62 Merge pull request #7889 from vbatts/vbatts-tarsum_name_collision 
tarsum: name collision fix
 2014-09-17 21:59:39 +03:00
Jessica Frazelle fc75ade4f8 Add docker-exec to main manpage 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-09-17 11:46:49 -07:00
Vincent Batts c5e6362c53 tarsum: name collision fix 
If a tar were constructed with duplicate file names, then depending on
the order, it could result in same tarsum.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2014-09-17 14:37:46 -04:00
Alexandr Morozov c171cf0cc3 Merge pull request #8088 from unclejack/integcli-keep_permissions 
integcli: run inaccessible context test in tmpdir
 2014-09-17 22:06:26 +04:00
unclejack be924087eb integcli: run build tests in tmpdir 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-17 20:05:33 +03:00
Tibor Vass 8b97e2c287 Merge pull request #8084 from unclejack/improve_stdcopy 
stdwriter: improve perf by avoiding buffer growth
 2014-09-17 12:47:00 -04:00
Jessie Frazelle 129da8f842 Merge pull request #8085 from tianon/hack-install-location 
Add "hack/install.sh" to the "PRs welcome" note in the end of the install script
 2014-09-17 09:20:33 -07:00
unclejack 2f6b1d7f4e Merge pull request #6 from LK4D4/benchmark_for_8084 
Benchmark for StdWriter.Write
 2014-09-17 18:39:46 +03:00
Alexandr Morozov 55cac6c942 Benchmark for StdWriter.Write 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-17 19:24:07 +04:00
unclejack 277aa9c674 stdcopy: improve perf by avoiding buffer growth 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-17 18:06:17 +03:00
unclejack 1f03e60c2a move stdcopy to pkg/stdcopy 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-17 18:06:17 +03:00
Tianon Gravi adb6910095 Add "hack/install.sh" to the "PRs welcome" note in the end of the install script 
Also, simplified the output method by using `cat >&2 <<EOF ...` instead of multiple lines of `echo >&2 '...'`.

Signed-off-by: Andrew Page <admwiggin@gmail.com>
 2014-09-17 08:09:39 -06:00
Tianon Gravi 459b403c2f Merge pull request #8083 from unclejack/install_apparmor 
hack/install.sh: install apparmor when enabled
 2014-09-17 08:05:29 -06:00
unclejack 9851e8c4c1 use custom marshalling for JSONLog 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-17 17:03:54 +03:00
Tianon Gravi bcf7ca0731 Merge pull request #8080 from SvenDowideit/test-for-ext4-fs-kernel-options 
It seems that we need these 2 options enabled for both aufs and devicema...
 2014-09-17 08:01:20 -06:00
unclejack 9ae3134dc9 add the timeutils package 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-17 14:30:08 +03:00
unclejack 9619ce9dd1 hack/install.sh: install apparmor when enabled 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-17 12:13:31 +03:00