1
0
mirror of https://github.com/docker/cli.git synced 2026-01-29 18:02:11 +03:00
Commit Graph

5871 Commits

Author SHA1 Message Date
Guillaume J. Charmes
3fcc60d0f7 Allow to disable memory limit at compilation time
Upstream-commit: 1967c8342aef1a81eb33a41d673bb8e702daa5df
Component: engine
2013-04-12 10:48:20 -07:00
Guillaume J. Charmes
1875a00c38 Allow use to set his own dns via -dns
Upstream-commit: 7673afc8438a9e46a1d11aff0f8c0f7eca169809
Component: engine
2013-04-12 10:43:13 -07:00
Solomon Hykes
c74dd47b04 Fixed wording of ghost-related messages
Upstream-commit: b1fbebb4a3611d340176ad637a22d2250085a077
Component: engine
2013-04-12 10:39:08 -07:00
Solomon Hykes
9c360e79b0 Merge remote-tracking branch 'origin/ghost_handling-fix'
Upstream-commit: 3527291b477510b1b9f904988599b6499211c3f3
Component: engine
2013-04-12 10:33:36 -07:00
Solomon Hykes
5137cc3f51 Merge remote-tracking branch 'origin/kill_behaviour_fix'
Upstream-commit: 57d31c9777a5f79ffe56dd813e61ad1eace6d59d
Component: engine
2013-04-12 10:20:26 -07:00
Guillaume J. Charmes
f071f50ea4 Merge pull request #403 from titanous/update-authors
Update AUTHORS
Upstream-commit: a2f5a5614395a761f8871eaa4f6a1c0506c9953d
Component: engine
2013-04-12 07:56:19 -07:00
Jonathan Rudenberg
9b95a8b869 Update AUTHORS
Upstream-commit: 343ed6b53f225e35bb5464efb556f555a31056a1
Component: engine
2013-04-12 10:44:50 -04:00
Guillaume J. Charmes
ebb6835d20 Go fmt
Upstream-commit: 22893429ed29dbb7a01eed7a90a4d1fbecfd5d90
Component: engine
2013-04-12 07:37:24 -07:00
Guillaume J. Charmes
b4724f4f76 Merge branch 'create_pidfile' of https://github.com/flavio/docker into flavio-create_pidfile
Upstream-commit: c1703c2b68da74680310ae58f5368d6c677a68ef
Component: engine
2013-04-12 07:28:36 -07:00
Guillaume J. Charmes
1568d28853 Merge pull request #381 from dotcloud/371-add-l-ps
Add options to docker ps
Upstream-commit: a8c15477d95c6a3b1bc81fdb1662c8196a1b6007
Component: engine
2013-04-12 07:16:00 -07:00
Guillaume J. Charmes
62557298dd Merge pull request #395 from dotcloud/commands_usage-fix
fixes some usages (multiple parameters mostly)
Upstream-commit: 9d03b2bb6265dd5a0dc097bf3382bd2dd1762bec
Component: engine
2013-04-12 07:03:36 -07:00
Victor Vieux
b5ccb3f71c removed not needed [OPTIONS] and remove poor messages like 'Not enough arguments'
Upstream-commit: 8987bd5832d8162805d34b89c567fcf2e933f746
Component: engine
2013-04-12 12:26:31 +02:00
Daniel Mizyrycki
f8333f7048 Packaging, Debian: Add maintainer documentation
Upstream-commit: f226842aa1f9148449558c90de7cdfb61105df28
Component: engine
2013-04-11 20:17:41 -07:00
Daniel Mizyrycki
5b2bb885c1 Packaging: Add README documentation
Upstream-commit: b14164879b4461b77b630719e67d619acf1a7648
Component: engine
2013-04-11 17:39:47 -07:00
Guillaume J. Charmes
34381c942f Add unit test for hanging kill + fix other tests behaviour
Upstream-commit: bb22cd492efdc67855bbcf8ab4a669e45ea9ee8e
Component: engine
2013-04-11 16:21:19 -07:00
Solomon Hykes
1296a36fab Merge pull request #386 from lopter/master
Use ip to setup the gateway in sysinit.go
Upstream-commit: 27be5aec74773100f3e59c432a737cb712c8b368
Component: engine
2013-04-11 15:02:20 -07:00
Solomon Hykes
c1ad596926 Added docker-build (formerly github.com/shykes/changer) as a contrib script
Upstream-commit: 048f9f4974ac74fac3b03af132c392daaa9f134e
Component: engine
2013-04-11 14:44:39 -07:00
Flavio Castelli
7f83ef43de docker daemon: create file containing PID
Ensure the docker daemon creates a file containing its PID under
/var/run/docker.pid.

The daemon takes care of removing the pid file when it receives either
SIGTERM, SIGINT or SIGKILL.

The daemon also refuses to start when the pidfile is found. An
explanation message is shown to the user when this happens.

This change is required to make docker easier to manage by tools like
checkproc which rely on this information.
Upstream-commit: fb0b375be70e79eaa8349143dceef048db6e0e19
Component: engine
2013-04-11 21:41:08 +02:00
Solomon Hykes
2f118e2b3a Simplify the output of 'docker images' by removing the PARENT column
Upstream-commit: 79d934bfb0d2e5d30a89a42c1a106d9d3698775b
Component: engine
2013-04-11 12:11:41 -07:00
Solomon Hykes
855acfb07d Merge remote-tracking branch 'origin/148-remove_repositories-feature'
Upstream-commit: 54dfedc516918b9c0f343dbb09ce2e9cc17c4e61
Component: engine
2013-04-11 11:36:28 -07:00
Solomon Hykes
47db51b4c0 Merge remote-tracking branch 'origin/crlf_on_raw_mode'
Upstream-commit: 0eb7157b6f23a70da2568796344bd6b333944aac
Component: engine
2013-04-11 11:31:17 -07:00
Solomon Hykes
d6545d6e21 Contrib post-commit hook for checking gofmt
Upstream-commit: 2de953490d6a4ccba9668484fce1f028578c6f77
Component: engine
2013-04-11 11:30:35 -07:00
Victor Vieux
2470a0415a fixes some usages
Upstream-commit: 3ba44d2d5fac067f7fcd3d5abed83b08c8ddb24d
Component: engine
2013-04-11 18:46:47 +02:00
Guillaume J. Charmes
c36cca18b4 Detect and mark ghost container.
Upstream-commit: 313d13ea01f58c3e611fb85e435d36dd4907a6ac
Component: engine
2013-04-11 09:26:17 -07:00
Guillaume J. Charmes
46c83a02af force kill now use lxc-kill. Fixes #383
Upstream-commit: e68c04b722b4c001c999abc2cd5b60b1f1b34457
Component: engine
2013-04-11 09:04:04 -07:00
Guillaume J. Charmes
2bb40279d3 Merge pull request #392 from dotcloud/rm_usage-fix
Display usage when no parameter in docker rm
Upstream-commit: c902c43766641eeba73aea2d9f96601394157d7d
Component: engine
2013-04-11 07:56:46 -07:00
Victor Vieux
0823d282a2 display usage when no parameter
Upstream-commit: c105049f7ea5927ec9d7258624391f6a2b43a6a3
Component: engine
2013-04-11 16:27:01 +02:00
Victor Vieux
556b0802fe snake_case to camelCase
Upstream-commit: 17136d58f29fdd921d41ebd7c67c73bd4078b023
Component: engine
2013-04-11 13:09:40 +02:00
Daniel Mizyrycki
5d8f85d0ac packaging; issue #251: Add debian packaging
Upstream-commit: 8ea1e9126f3d64216e2d8a91ce6f8ad1f3d8587c
Component: engine
2013-04-10 21:00:39 -07:00
Solomon Hykes
05958e6932 Skeleton of http API
Upstream-commit: 38e2d00199db5dabe9972ff9c3153ac6b63266f2
Component: engine
2013-04-10 19:48:21 -07:00
Guillaume J. Charmes
d2aba9b356 Use crlf in registry function to avoid issue with autlogin in push and autopull in run
Upstream-commit: 6dc4c74b5ab63e6de374fe839e05acf5998a6f72
Component: engine
2013-04-10 19:13:15 -07:00
Guillaume J. Charmes
1dcc582981 use crlf in login in order to avoir issue due to real raw mode
Upstream-commit: 9d1fd2317d5e3edee845410f10969b37ba37c9d5
Component: engine
2013-04-10 19:08:46 -07:00
Guillaume J. Charmes
4af9c309f0 Put the resolv.conf path in a variable instead of being hardcoded within lxc
Upstream-commit: 1f9f5eed5d004395886b8e93cec9389332d8fded
Component: engine
2013-04-10 18:23:34 -07:00
Louis Opter
7d008a24f8 Use ip to setup the gateway in sysinit.go
ip from iproute2 replaces the legacy route tool which is often not
installed by default on recent Linux distributions.

The same patch has been done in network.go and is re-used here.
Upstream-commit: 5e1a975b48c1d4e6743f68ca770f8fe06fb32ce4
Component: engine
2013-04-10 17:40:28 -07:00
Guillaume J. Charmes
bcc22cca7d Allow rmi to remove image from its name
Upstream-commit: 97f48e59fcfa8ca0f0a20ed80cab7330af93ae6d
Component: engine
2013-04-10 17:23:42 -07:00
Solomon Hykes
4fbbe500d2 Added temporary spec for data volumes as requested on #111
Upstream-commit: e41fd24542d96c503cd923a403c43aceaf9af965
Component: engine
2013-04-10 13:57:26 -07:00
Victor Vieux
053e80b29d changed last to n
Upstream-commit: 8bd192fb16a5ac9836d4b1d3df037af65b61ffce
Component: engine
2013-04-10 21:09:21 +02:00
Daniel Mizyrycki
226b7e3c89 testing: Make postcommit more generic
Upstream-commit: d2c1850fb5a210d59b87dcb8504c8c24b60cca3c
Component: engine
2013-04-10 11:32:48 -07:00
Victor Vieux
551b762e13 add -l to docker ps
Upstream-commit: 8c3331dc978e3cbbe3255a436c8f18f01158eb27
Component: engine
2013-04-10 19:30:57 +02:00
Solomon Hykes
884a342273 Merge pull request #372 from srid/goroutine-scope
serve goroutine must refer to the local conn
Upstream-commit: f507188ddc907f7e7b628145a89e455a5eeacc28
Component: engine
2013-04-09 21:06:31 -07:00
Solomon Hykes
63abdc99ee Merge remote-tracking branch 'origin/wait_non_existing_container-fix'
Upstream-commit: 76b7b2adf765732f8a43d7536e9720d2b4f3f6bb
Component: engine
2013-04-09 21:05:15 -07:00
Solomon Hykes
a6a98ff910 Merge pull request #377 from jbarbier/buildbot
Fix the Makefile, rule=hack to make it work on Windows
Upstream-commit: cb68662b9bea7dbd53296e9f0129cdac9131b688
Component: engine
2013-04-09 20:53:29 -07:00
Julien Barbier
05a22d6527 Fix the Makefile, rule=hack to make it work on Windows
Upstream-commit: b7cda3288ed857e4e2155846090b17a2d8fccdbf
Component: engine
2013-04-09 19:07:50 -07:00
Solomon Hykes
3e6a546aa8 Merge pull request #367 from johncosta/333-redis-documentation
Add documentation for running a redis process with docker
Upstream-commit: a1f54cad6cc66d0a84b0bf0cc427fe40ba6448d3
Component: engine
2013-04-09 18:16:39 -07:00
Guillaume J. Charmes
e53c739014 Make sure all containers (even previously stopped) get a correct wait lock
Upstream-commit: 9f83b9df2256c7b34453d5da85c17fae516ee3a4
Component: engine
2013-04-09 17:40:02 -07:00
John Costa
aa4c6e3497 incorporate feedback for improving the PR
Upstream-commit: 4ab241c93080d8df6db4fd0c31b0c26008118422
Component: engine
2013-04-09 18:04:01 -04:00
Sridhar Ratnakumar
2f21f794cf serve goroutine must refer to the local conn
Upstream-commit: f731835e4577c414d37fa050aaec1f541511ff6b
Component: engine
2013-04-09 15:00:05 -07:00
Daniel Mizyrycki
263f9f8591 testing: Add buildbot VM
Upstream-commit: bbaa975ec8ea44f7df4f96a910360abc43b4d5f7
Component: engine
2013-04-09 14:37:37 -07:00
John Costa
bdbf282ee6 Merge github.com:dotcloud/docker into 333-redis-documentation
Upstream-commit: 418ef43fbb59d62dca20905bbc0753892ecb6c27
Component: engine
2013-04-09 16:07:40 -04:00
Solomon Hykes
58a81e417b Bumped version to 0.1.4
Upstream-commit: 40ebe78bb1d9750505d594d10bc9eb6979ef63ea
Component: engine
2013-04-09 13:00:50 -07:00