toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,033 Commits 3 Branches 295 Tags
506b7bed3d80eeb4d66d270d284f98c3d29fd1a4
Commit Graph
10033 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Solomon Hykes 506b7bed3d Check for conflicting daemon config options in NewDaemon 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 1eba59eb249b14a0499a52495be2c27b5afc4749
Component: engine
 2014-08-13 19:25:51 +00:00
Solomon Hykes 13ed6ae5e4 opts.IPVal returns an error on incorrect input 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: ca11b77471bd3a99b4dbc44b716675ba8174306c
Component: engine
 2014-08-13 19:25:51 +00:00
Solomon Hykes 9a4f8cadf4 Parse daemon configuration in daemon.Config.InstallFlags instead of main 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 353b7c8ec77b30fa83dac5ec0778193f6de8b437
Component: engine
 2014-08-13 19:25:51 +00:00
Solomon Hykes 8bd8c43b79 Helpers to parse lists, IPs, hosts, dns searches from the command line 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 6200002669874f3314856527fecd0c004060913c
Component: engine
 2014-08-13 19:25:47 +00:00
Solomon Hykes a2a8fb8a10 opts.IpOpt: a helper to parse IP addressed from the command line 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 6d59a566759da5729d7eb89a8e1888fc612f03cf
Component: engine
 2014-08-13 19:09:51 +00:00
Solomon Hykes ec374f9227 Move daemonconfig into daemon 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: a4befff533cf786df7a4da29798984ebb2268d8c
Component: engine
 2014-08-13 19:09:51 +00:00
Victor Vieux 779c425729 Merge pull request #6162 from vbatts/vbatts-ps_filter 
docker ps: introducing filters
Upstream-commit: c9c271858a652583ba548cb2ea75df68b51a9dd3
Component: engine
 2014-08-13 11:44:48 -07:00
unclejack 8aa76c02e6 Merge pull request #7553 from LK4D4/update_to_1.3.1 
bump Go to 1.3.1
Upstream-commit: c071cd7c7ccd3a0da7d5a9331119cd2e84e4380a
Component: engine
 2014-08-13 21:42:32 +03:00
Michael Crosby 09e4804b95 Merge pull request #7559 from LK4D4/fix_udp_proxy_deadlock 
Fix deadlock on failed dial in UDP userland proxy
Upstream-commit: 1c5a4e09006b5b91f1bf5b3f020625a539fd165f
Component: engine
 2014-08-13 11:11:09 -07:00
Michael Crosby 92c1c69d9f Merge pull request #7555 from LK4D4/fix_vet_warnings 
Fix go vet warnings
Upstream-commit: ad7279e48053adfde3ba20a5c67e812a7ec677f6
Component: engine
 2014-08-13 10:40:38 -07:00
Michael Crosby 03178ee6e6 Merge pull request #7556 from shykes/cristian-integration-maintainer 
Add Cristian to integration/MAINTAINERS
Upstream-commit: 3cc79e7818f0859ec1b84fef7e50a7c1d8209b96
Component: engine
 2014-08-13 10:39:50 -07:00
Michael Crosby 6f9dfebc7f Merge pull request #7497 from shykes/cleanup-server 
Remove deprecated server package
Upstream-commit: c9e359cf977fbbfaf32527c2c3f71a1910deb21a
Component: engine
 2014-08-13 10:37:37 -07:00
James Turnbull 865b17dc7d Merge pull request #7552 from michaelthies/patch-1 
Update postgresql_service.md
Upstream-commit: 8c38a3d7321b75b2344dbf3efaf1e93437f9bac0
Component: engine
 2014-08-13 09:40:51 -04:00
Alexandr Morozov 08557c40b7 Fix deadlock on failed dial in UDP userland proxy 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 6cbb8e070d6c3a66bf48fbe5cbf689557eee23db
Component: engine
 2014-08-13 17:18:37 +04:00
Vincent Batts acbbac3aa0 docker ps: introducing filters 
* starting with filtering for exit codes. `docker ps -a --filter 'exited=1'`
* API doc for filter parameter
* formatting filters for help usage
* tweaks for review

This requires https://github.com/dotcloud/docker/pull/4430

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 84146719d8b8322e302e7a0250fe8a3ee1a4edcd
Component: engine
 2014-08-13 09:12:33 -04:00
Tianon Gravi b5e0d56fb1 Merge pull request #7545 from tianon/mkimage-lucid-fix 
Fix contrib/mkimage/debootstrap for Lucid
Upstream-commit: 57f6b3e1ecafa706bffed5d44f69c8dfddcff06f
Component: engine
 2014-08-13 06:46:51 -06:00
Solomon Hykes defddfab5d Add Cristian to hack/MAINTAINERS 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 7d1b2ebde8a0d1484f486b5ea01b1a77014b958b
Component: engine
 2014-08-13 08:13:51 +00:00
Solomon Hykes fc45b3edd5 Add Cristian to integration/MAINTAINERS 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: da63a93e89f2ea8f35f22a082f4a406456fc6a09
Component: engine
 2014-08-13 07:50:40 +00:00
Alexandr Morozov 00b87e1af9 Fix go vet warnings 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 391c35c82252633eb415fdade08103a8a0818fde
Component: engine
 2014-08-13 11:37:30 +04:00
Solomon Hykes d27f6d0c6d Remove deprecated server/ package 
Victory!

Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 63503cafe4addb7d275244fbcce0e10d67225cc9
Component: engine
 2014-08-13 06:56:45 +00:00
Alexandr Morozov b0523c12b8 bump Go to 1.3.1 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: c6595b3ee83d5cf8348739949e74720e62f7dd50
Component: engine
 2014-08-13 10:49:03 +04:00
Michael Thies ca40497b63 Update postgresql_service.md 
fix typo
Upstream-commit: 99423e7e1ef7d833e333389b15a372179734c03f
Component: engine
 2014-08-12 23:30:04 -05:00
Solomon Hykes 3ab02734f3 Move "build" to daemon/build.go 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 491deae9b8866b5b0774bbc92ee82f7cd7b565eb
Component: engine
 2014-08-13 03:12:33 +00:00
Michael Crosby e4f970ea7e Merge pull request #7301 from vieux/fix_goroutines_leak_exit_code 
fix goroutines leak and exit code
Upstream-commit: 64579f51fcb439c36377c0068ccc9a007b368b5a
Component: engine
 2014-08-12 17:37:24 -07:00
Victor Vieux 01c8dcaf20 fix goroutines leak and exit code 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)

Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: b06311a72e7979653f09ba8175e10733e7116985
Component: engine
 2014-08-13 00:03:56 +00:00
Tibor Vass ee093e314d Merge pull request #7549 from vieux/fix_leftover 
fix #7374 leftover
Upstream-commit: 136631df46aea853d968f6f8c284381c2ee91604
Component: engine
 2014-08-12 19:51:57 -04:00
Victor Vieux a11716ca83 fix #7374 leftover 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: bcfd6a653b5038679246b023d83476be073d4c91
Component: engine
 2014-08-12 23:37:33 +00:00
James Turnbull f82c0c847e Merge pull request #7359 from timthelion/patch-10 
Add process for PR acceptance, review, rejection
Upstream-commit: 3de3719290d63e1827ad61c84256e5cc219dea91
Component: engine
 2014-08-12 19:17:10 -04:00
Tianon Gravi dc6c9f58e7 Fix contrib/mkimage/debootstrap for Lucid 
Later versions of `apt` are smart enough to just create this directory if it's missing, but Lucid balks (just like `gnupg` and `gpgv` aren't in the Required set so don't come in a minbase -- good ol' Lucid).

Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: 631fadc0b9c46c1af82f9161deab83a7fb797c2a
Component: engine
 2014-08-12 15:37:42 -06:00
Victor Vieux 0a10aaa4dd Merge pull request #7538 from LK4D4/move_some_integration_to_cli 
Move some integration to cli
Upstream-commit: 91a2f22acac569b8e1bf279845c53e0499de50d4
Component: engine
 2014-08-12 14:17:08 -07:00
Timothy Hobbs db1cb3039c Add process for PR acceptance, review, rejection 
This is an extremely tentative PR.  However, I feel that the suggestions are generally good.

Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: timthelion)
Upstream-commit: e4a09cd79d0ee3fbb6a33552a21c53491d9f3953
Component: engine
 2014-08-12 20:29:45 +00:00
Tibor Vass b1b27b03fb Merge pull request #7466 from tiborvass/irc-meetings 
Add irc-meetings section in CONTRIBUTING
Upstream-commit: 18a0eba72dfec57b02a799ae064a60a88d6988c9
Component: engine
 2014-08-12 13:36:57 -04:00
Tibor Vass 137daba41a Add irc-meetings section in CONTRIBUTING 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: c58c70b8bdfc4d13faefaab31d2d1539d5478223
Component: engine
 2014-08-12 13:35:14 -04:00
Victor Vieux 9418307e16 Merge pull request #7528 from lalyos/fix_version_number_comparison 
Fix version number comparison
Upstream-commit: 0771eb32dc2e52bd05053d8a0e529741fa639d49
Component: engine
 2014-08-12 10:16:55 -07:00
James Turnbull 547d1e2095 Merge pull request #7531 from ChristopherBiscardi/priv-repos 
Private Repos Copy Change
Upstream-commit: d42326d9277dd12946981c7435d468807c462157
Component: engine
 2014-08-12 09:50:21 -04:00
James Turnbull 6424fd2af8 Merge pull request #7533 from cirocosta/patch-1 
Updates docs regarding linux mint troubleshot
Upstream-commit: 96b52545ab03b36d711a095afb0a7e7121e9a153
Component: engine
 2014-08-12 08:21:30 -04:00
Alexandr Morozov 855652ad6c Move TestRunExit to integration-cli 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: c19e0fe7e2c626218c854aa97fd3f23d29f11615
Component: engine
 2014-08-12 13:40:14 +04:00
Alexandr Morozov 3f9bc8ad8a Move TestRunWorkdirExistsAndIsFile to integration-cli 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: a44f065f171cb91867630e752c09fde4b01d4c98
Component: engine
 2014-08-12 12:22:25 +04:00
Ciro S. Costa f5781e0e49 Updates docs regarding linux mint troubleshot 
Signed-off-by: Ciro S. Costa <ciro.costa@usp.br>
Upstream-commit: fcddecc828a95083db8975391e623289b2fe1254
Component: engine
 2014-08-12 02:56:57 -03:00
Victor Vieux 7d5baeee4d Merge pull request #7490 from crosbymichael/reexec 
Use argv0 as reexec implementation for dockerinit
Upstream-commit: 01995ebebb3f26a2bd1e1131b5794e8b6b6ae18e
Component: engine
 2014-08-11 18:43:34 -07:00
Michael Crosby 47e45ae0eb Panic if trying to register an func with the same name 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 1a249a5feb9880465594299c1d4965b160e4a14e
Component: engine
 2014-08-11 18:13:27 -07:00
Sven Dowideit bf1fefd603 Merge pull request #7398 from SvenDowideit/add-more-details-to-https-docs 
tell the user what to expect, including that it is a verbose process.
Upstream-commit: 2c882a482e8ac6a3040adee8241cd9e04eb8fad7
Component: engine
 2014-08-12 10:35:28 +10:00
Sven Dowideit b38de9ff8f tell the user what to expect, including that it is a verbode process. 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: b94f2c4c6d6fa7b3efc0dbf8874735b12d00b57c
Component: engine
 2014-08-12 10:32:38 +10:00
ChristoperBiscardi 9379864263 Private Repos Copy Change 
Docker-DCO-1.1-Signed-off-by: Christopher Biscardi <biscarch@sketcht.com> (github: ChristopherBiscardi)
Upstream-commit: df9650eebb12d980aaf114ac7b2223764dc964b7
Component: engine
 2014-08-11 16:37:58 -07:00
lalyos 424449854e Fix equal short-long version number comparison 
Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com>
Upstream-commit: 58ef92f89e5c6637506d2d03784daba50e82d7ff
Component: engine
 2014-08-11 23:40:35 +02:00
lalyos 29770af1da Add test case for identical short and long version numbers 
Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com>
Upstream-commit: 8a4d2d6f7fc2f9ab5ea488d4b4ba76313862fbc0
Component: engine
 2014-08-11 23:36:09 +02:00
Fred Lifton 09bdb7ffa9 Merge pull request #7516 from thaJeztah/faqs-explain-debian-noninteractive 
Add "DEBIAN_FRONTEND" to FAQ
Upstream-commit: 8595a4ff7a18f6eb80e28d49d4dbecca794b369e
Component: engine
 2014-08-11 14:19:06 -07:00
Sebastiaan van Stijn 1b06736c1b Add "DEBIAN_FRONTEND" to FAQ 
Added some explanation on using ‘DEBIAN_FRONTEND’ to the FAQs. As
discussed here;
https://github.com/docker/docker/pull/7035#issuecomment-50967867

Docker-DCO-1.1-Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (github: thaJeztah)
Upstream-commit: 2e5d35c1f1bf0b565b288fa9146059d9f3af61b7
Component: engine
 2014-08-11 23:12:47 +02:00
Michael Crosby c9eb513960 Merge pull request #7507 from shykes/cleanup-tiny 
Cleanup: tiny little things
Upstream-commit: 57e0cbb991783f3b5a6b24afe6c5978cd9839a01
Component: engine
 2014-08-11 12:41:17 -07:00
Michael Crosby 42c37ddd04 Fix hack in old integration test for new init 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 9694209241074c10d4cc625b24dfedcb2387de93
Component: engine
 2014-08-11 11:47:22 -07:00