p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
5,892 Commits 2 Branches 295 Tags
61ba43da9fbdd98458177cb5109bda95d6e9289f
Commit Graph

118 Commits

Author SHA1 Message Date
Michael Crosby
61ba43da9f Merge pull request #3105 from philips/add-socket-activation 
Add socket activation
Upstream-commit: 2723133a69a292abaa021afff98de127bda57b4e
Component: engine
 2014-01-28 11:38:25 -08:00
Tianon Gravi
07c81f6fbb Add --ip-forward flag to daemon (enabled by default) which automatically sets "net.ipv4.ip_forward" to 1 
See also https://groups.google.com/d/topic/docker-dev/DCjF5Prx7HA/discussion

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: cabe624c823348579ada234e3c029479683f624c
Component: engine
 2014-01-27 21:35:05 -07:00
Brandon Philips
bbf27c35bb fix(docs): fixup based on changes in master 
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: cfeb1f0f652e11b8b6a8b4e1cbed3835fc5d9546
Component: engine
 2014-01-27 17:18:09 -08:00
Victor Vieux
7822beced6 update commands.go 
update docker.go

move to pkg

update docs

update name and copyright

change --sinceId to --since-id, update completion and docs

Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor@docker.com> (github: vieux)
Upstream-commit: e71dbf4ee5add5736f595948fc20bd01af56a744
Component: engine
 2014-01-17 17:33:15 -08:00
Michael Crosby
87ba43c927 Add DOCKER_HOST env var for client 
This env var will set the -H flag on the docker
client.
Upstream-commit: f50b8b08b5742c8e55df2d610d428c39cf1f4947
Component: engine
 2013-12-28 16:42:18 -08:00
Michael Crosby
44050b9219 Allow mtu to be configured at daemon start 
Upstream-commit: 566ff54d0ddffbeb3ba2e5f1e400db8528faf0a7
Component: engine
 2013-12-20 12:12:03 -05:00
Josh Poimboeuf
f633c6e7d1 Move root symlink check to engine.New 
Since commit c91c365, when starting the docker daemon without an
existing /var/lib/docker directory, it fails with:

  2013/12/18 23:39:36 Unable to canonicalize root (%!s(*string=0xc210077c80)): lstat /var/lib/docker: no such file or directory

Move the symlink checking code to engine.New after the root dir has been
created.
Upstream-commit: 94821a33534a25fe906f3f66e1c06b1f2c877aac
Component: engine
 2013-12-19 00:39:12 -06:00
Tianon Gravi
624a293ce3 Canonicalize our root path before we try using it, because we make assumptions about it not containing symlinks 
Fixes #3242
Upstream-commit: c91c365f8860315d29a17368b78dcefb23674042
Component: engine
 2013-12-18 11:15:09 -07:00
WarheadsSE
ca9e7bd94d Add -bip flag: allow specification of dynamic bridge IP via CIDR 
e.g.:

```
docker -d -bip "10.10.0.1/16"
```

If set and valid, use provided in place of trial and error from pre-defined array in network.go.
Mutually exclusive of -b option.
Upstream-commit: a68d7f3d70ab1638fd5b63a3026b211cb4e7a65e
Component: engine
 2013-12-13 10:47:19 -05:00
JP
e3b038914a Fixes #2820 
Upstream-commit: 3cd9b2aadfd16736032ee569ba263fce53286347
Component: engine
 2013-12-02 16:22:39 -05:00
Michael Crosby
26b3fb6752 Merge pull request #2829 from dotcloud/refactor_opts 
Refactor opts
Upstream-commit: fe571dd29328efe5f5318c0b146d0aa5a66217a2
Component: engine
 2013-12-02 10:41:30 -08:00
Johannes 'fish' Ziemke
85e4b81e0c Make docker build return exit code of build step 
If a command during build fails, `docker build` now returns with
the exit code of that command.

This makes it necessary to change the build api endpoint to
return a json object stream.
Upstream-commit: b04c6466cdc89a107879af7a22b0917006b38730
Component: engine
 2013-12-02 17:52:37 +01:00
Guillaume J. Charmes
9ed97e9dc0 Change the default Host affectation to not rely on slice 
Upstream-commit: 5e3f6e7023fbd0cfd1233a99c332801755340cfb
Component: engine
 2013-11-26 18:31:59 +00:00
Guillaume J. Charmes
8567f00b02 Format main() 
Upstream-commit: 1beb5005d11b8fadd04e51c4a1341779d26a475d
Component: engine
 2013-11-26 17:47:58 +00:00
Guillaume J. Charmes
f211a9a21d Refactor Opts 
Upstream-commit: 1ba11384bf82f824b0efbab31aaca439cfba1b4f
Component: engine
 2013-11-26 17:46:06 +00:00
Michael Crosby
93120354fd Change graph-driver flag to be s 
Upstream-commit: b4eeb6be617d96132cbd5998a658e5ab88334940
Component: engine
 2013-11-25 09:43:32 -08:00
Tianon Gravi
cdba895115 Update a few flag help strings for consistency and clarity 
Upstream-commit: 1ab6b8bf4970b050575b008dd658471e185f2a2c
Component: engine
 2013-11-21 12:30:17 -07:00
Michael Crosby
c8cec50adf Add flag to set default graph driver 
Remove the env var DOCKER_DRIVER
Upstream-commit: 6dbeed89c061b85551ab638f93282d87de8ab929
Component: engine
 2013-11-19 02:37:44 -08:00
Solomon Hykes
a48718c85a Merge branch 'job-create-start-clean' into engine-patch-2 
Conflicts:
	engine/engine.go
	engine/job.go
	server.go
	utils_test.go
Upstream-commit: 6c4393ccbbec0fa66f9fc7e326b5a2809615c3a1
Component: engine
 2013-11-13 00:36:20 +00:00
Guillaume J. Charmes
6d24142423 go fmt 
Upstream-commit: 6998c3c387518ba8e06ceff00b10be583c95d6cd
Component: engine
 2013-11-07 12:27:33 -08:00
Solomon Hykes
bf0674c59a Fix main() 
Upstream-commit: 5c42b2b5122c1db08d229c258da26869b4d4d9cc
Component: engine
 2013-11-05 23:00:20 +00:00
Solomon Hykes
5d5633048a Engine: optional environment variable 'Logging' in 'serveapi' 
Upstream-commit: 02ddaad5d985186eed94dea4105a57fa21ba24db
Component: engine
 2013-11-05 18:39:59 +00:00
Solomon Hykes
8a182f4aaf Separate a) initialization of the http api and b) actually serving the api into 2 distinct jobs 
Upstream-commit: 433c8e9c7da7cd3cd952c3dce3763db70fc450e5
Component: engine
 2013-11-05 17:41:37 +00:00
Victor Vieux
04226c60be Merge pull request #2494 from shykes/engine-links 
Engine: Minimal, unintrusive implementation of a cleaner Job API.
Upstream-commit: e3c49843d70ea2856592a7af5e5d83e655898a70
Component: engine
 2013-10-31 16:32:49 -07:00
Victor Vieux
a8a9a4c44f set containers comm to true by default 
Upstream-commit: f7c40a87f3b20f00b073652fc7b4e97a4035ae92
Component: engine
 2013-10-30 14:48:19 -07:00
Solomon Hykes
1ae36ff617 Engine: Engine.Job() never fails, to mimic the os/exec API (and make usage less verbose) 
Upstream-commit: a13241d370bb9862acdefbc7dbb1e338d9552eaa
Component: engine
 2013-10-26 17:49:16 -07:00
Solomon Hykes
ae44c03557 Setup daemon pidfile/cleanup in Server.Daemon() instead of main() 
Upstream-commit: c1ae1a0e1cfae1aed681add5b1cb1c39e2c0e929
Component: engine
 2013-10-26 14:26:07 -07:00
Solomon Hykes
b6319ac31a Rename 'GraphPath' to the more logical 'Root'. This does not affect users except for a slight text change in the usage messge 
Upstream-commit: 7e691e11b033f35fe823fbc6dcb40decd584696d
Component: engine
 2013-10-26 14:24:13 -07:00
Solomon Hykes
2bbe323db0 Minimal, unintrusive implementation of a cleaner Job API. 
* Implement a new package: engine. It exposes a useful but minimalist job API.
* Refactor main() to instanciate an Engine instead of a Server directly.
* Refactor server.go to register an engine job.

This is the smallest possible refactor which can include the new Engine design
into master. More gradual refactoring will follow.
Upstream-commit: 0d1a825137448e2f41e5aaa5ecae8094c8ab6817
Component: engine
 2013-10-26 14:18:13 -07:00
Michael Crosby
3f2eaa1c43 Use persistent connection for links database 
Add close method to Runtime and Server to make sure
that any underlying connections are cleaned up
Upstream-commit: 7c08aeeba4ab94f77e221bfc01741cce0866d224
Component: engine
 2013-10-25 15:13:25 -07:00
Alexander Larsson
69a28976c0 Move SysInit to a submodule 
This allows docker-init to not import the main docker
module, which means it won't e.g. pick up any sqlite
dependencies.
Upstream-commit: db999667245926569b161747eed7e08b2ec1c34c
Component: engine
 2013-10-25 15:13:24 -07:00
Alexander Larsson
cd17fb7c91 Move ListOps to utils submodule 
This will be needed for later use in docker-init without a docker
dependency
Upstream-commit: d063c8d941d366e4815b91c4fa4fc91fc1e1eb23
Component: engine
 2013-10-25 15:13:24 -07:00
Michael Crosby
226b51e180 Add flag for inter-container communication 
Upstream-commit: ce965b8c43f91f0c32403cfaadfd4e279421090b
Component: engine
 2013-10-25 15:13:24 -07:00
Michael Crosby
952ac8a789 Add links for container relationships and introspection 
Upstream-commit: 1cbdaebaa1c2326e57945333420d25d6f77011d5
Component: engine
 2013-10-25 15:13:24 -07:00
Victor Vieux
037a64a1b2 remove useless os.Exit() after log.Fatalf 
Upstream-commit: 92384649cfd7d69a3e493231aadf616bf8704109
Component: engine
 2013-10-24 00:25:55 -07:00
Yang Bai
3f6f7d77a8 let utils.ParseHost return err when errors happen 
Upstream-commit: e81da876df57fb8e0562cc64e7b57dc7eb32284a
Component: engine
 2013-10-24 13:23:02 +08:00
Victor Vieux
3ce3024fa4 keep -r, but default true 
Upstream-commit: e594c788e4f42d4878c1b3d16139db0291ed830c
Component: engine
 2013-10-03 22:42:35 +00:00
Victor Vieux
fb9071f221 only os.Exits on error 
Upstream-commit: 46a1cd69a99a9adc7bc366f1eb2c03b62f464d39
Component: engine
 2013-09-09 21:26:35 +00:00
jbbarth
0731b44888 Improve formatting with 'go fmt' as stated in CONTRIBUTING.md 
As 'go fmt' doesn't support verifying files in multiple directories,
it's probably a good idea to run it on all '*.go' files from time to
time with something like this:

  find . -name "*.go" | xargs dirname | sort -u | xargs -n 1 echo go fmt
Upstream-commit: d80b50d4b4759665b93e713b99239aba9893416e
Component: engine
 2013-08-27 10:05:25 +02:00
Solomon Hykes
436a1e7c85 docker -v: show version and build information without making remote connections 
Upstream-commit: 9fce6f662ae3e31832bbc45938e509824bea67d5
Component: engine
 2013-08-20 19:32:37 -07:00
Solomon Hykes
0bebe41d5e Move VERSION to a dedicated file to facilitate automated builds and releases 
Upstream-commit: 9087ef9a770789e6987cd1ca4396d6b20a446724
Component: engine
 2013-08-20 19:32:37 -07:00
Pascal Borreli
efc4a51c0c Fixed typos 
Upstream-commit: 9b2a5964fc2067014f24e26bd2f99873751ebdc3
Component: engine
 2013-08-12 18:53:06 +01:00
Michael Crosby
810e95ee21 Change daemon to listen on unix socket by default 
Upstream-commit: 8934f13615e95a0c9f4bc52eefb5c97360e114f3
Component: engine
 2013-08-06 00:12:56 +00:00
Guillaume J. Charmes
0c11df3e01 Merge pull request #1267 from sridatta/new-clean-init 
* Runtime: Fix to "Inject dockerinit at /.dockerinit"
Upstream-commit: f6fa353dd8be732aaed20f0c64a5ae8ccc9f1dbc
Component: engine
 2013-08-05 13:23:22 -07:00
Stefan Praszalowicz
466341e775 Document -b none 
Upstream-commit: 964e826a9beb69a0246ed22c7935fd86df6712e1
Component: engine
 2013-07-21 18:01:52 -07:00
Solomon Hykes
7c7e6abf06 + Runtime: inject dockerinit at /.dockerinit instead of overwriting /sbin/init. This makes it possible to run /sbin/init inside a container. 
Upstream-commit: 5d8efc107d2c7b7da61a6d22657190c6f13713d2
Component: engine
 2013-07-17 17:13:34 -07:00
Caleb Spare
f4980e7dfe Gofmt -s (simplify) 
Upstream-commit: da3962266a4103f2dbf019180585d206fb9e25ff
Component: engine
 2013-07-03 14:35:18 -07:00
Victor Vieux
d9bf1bf281 Merge branch 'add-daemon-storage-path-param' of https://github.com/heavenlyhash/docker into heavenlyhash-add-daemon-storage-path-param 
Upstream-commit: 862e223cecec203a96d3be4fd667bc9286703e82
Component: engine
 2013-06-25 13:33:45 +00:00
Eric Myhre
ffff9b2ac4 Add argument to allow setting base directory for docker daemon's storage to values other than "/var/lib/docker". 
Upstream-commit: e44f62a95cc8f3cab446205d66450ee37911e29c
Component: engine
 2013-06-20 16:29:54 -05:00
Solomon Hykes
a4e9bba7a3 Merge branch 'master' into simpler-build-upload 
Conflicts:
	api.go
	builder_client.go
	commands.go
Upstream-commit: e43323221b15d90956a200754bbf3e1d92d7bb1c
Component: engine
 2013-06-20 14:19:09 -07:00