Commit Graph

4030 Commits

Author SHA1 Message Date
1eb8e79404 Windows: Add file version information
This change adds file version information to docker.exe and dockerd.exe by
adding a Windows version resource with the windres tool.

This change adds a dependency to binutils-mingw-w64 on Linux, but removes
a dependency on rsrc. Most Windows build environments should already have
windres if they have gcc (which is necessary to build dockerd).

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 5c252a7914
Component: cli
2016-04-24 10:55:51 -07:00
8becd69255 Cleanup from CR.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ef9ad85429
Component: cli
2016-04-23 15:05:15 -04:00
c8402be431 Build two binaries client and daemon.
Add a proxy to support 'docker daemon'
Fix configFile option, and remove a test that is no longer relevant.
Remove daemon build tag.
Remove DOCKER_CLIENTONLY from build scripts.

Signed-off-by: Daniel Nephin <dnephin@docker.com>

Change docker-daemon to dockerd.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 0c4f21fee3
Component: cli
2016-04-22 11:26:01 -04:00
fb521be467 Build two binaries client and daemon.
Add a proxy to support 'docker daemon'
Fix configFile option, and remove a test that is no longer relevant.
Remove daemon build tag.
Remove DOCKER_CLIENTONLY from build scripts.

Signed-off-by: Daniel Nephin <dnephin@docker.com>

Change docker-daemon to dockerd.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 91dd0c0c69
Component: cli
2016-04-22 11:26:01 -04:00
c5f866738c fix typos
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 57171ee83c
Component: cli
2016-03-26 22:06:45 +08:00
8892876943 Update 'save' command help
Based on review feedback.

Signed-off-by: Martin Mosegaard Amdisen <martin.amdisen@praqma.com>
Upstream-commit: bcd0ac71ae
Component: cli
2016-03-22 08:16:52 +01:00
aebcbe8e0a Fix plural typo in 'save' command help
The form "Save an images" is not correct.
Either "Save an image" or "Save images" work, but since
the save commands accepts multiple images, I chose the
latter.

Fixed in all places where I could grep "Save an image(s)".

Signed-off-by: Martin Mosegaard Amdisen <martin.amdisen@praqma.com>
Upstream-commit: 54e7de9b12
Component: cli
2016-03-21 15:15:40 +01:00
c903000eea Remove some references to "register" through login
These were left-overs from the now deprecated
and removed functionality to registrer a new account
through "docker login"

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 38f2513340
Component: cli
2016-03-01 17:33:23 +01:00
c1018a0d0f Update RestartPolicy of container
Add `--restart` flag for `update` command, so we can change restart
policy for a container no matter it's running or stopped.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 7a30e41b84
Component: cli
2016-02-20 17:06:32 +08:00
763bb430ef fix grammar error
it is not very important,but I think the modification makes the coders read more conviently!

Signed-off-by: huqun  <huqun@zju.edu.cn>
Upstream-commit: c73cd919b4
Component: cli
2016-02-12 16:11:31 +08:00
f8da06917e Remove usage of pkg sockets and tlsconfig.
- Use the ones provided by docker/go-connections, they are a drop in replacement.
- Remove pkg/sockets from docker.
- Keep pkg/tlsconfig because libnetwork still needs it and there is a
  circular dependency issue.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9683297348
Component: cli
2015-12-29 19:27:12 -05:00
5d3e431b12 Implemet docker update command
It's used for updating properties of one or more containers, we only
support resource configs for now. It can be extended in the future.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: c9a59eb644
Component: cli
2015-12-28 19:19:26 +08:00
280ba2ad3c Added network to docker --help and help cleanup
Fixes https://github.com/docker/docker/issues/16909

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 22e3fabb45
Component: cli
2015-10-15 03:10:39 -07:00
6aa852474e Use consistent command description
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 2734a5821c
Component: cli
2015-10-08 08:46:21 -04:00
5f31535973 cli: new daemon command and new cli package
This patch creates a new cli package that allows to combine both client
and daemon commands (there is only one daemon command: docker daemon).

The `-d` and `--daemon` top-level flags are deprecated and a special
message is added to prompt the user to use `docker daemon`.

Providing top-level daemon-specific flags for client commands result
in an error message prompting the user to use `docker daemon`.

This patch does not break any old but correct usages.

This also makes `-d` and `--daemon` flags, as well as the `daemon`
command illegal in client-only binaries.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: c023f818aa
Component: cli
2015-07-23 19:44:46 -04:00
b5dcd430d5 Merge dockerd into docker. 'docker -d' runs in daemon mode. For all other commands, docker auto-detects whether to run standalone or to remote-control the daemon
Upstream-commit: 7f13a9cf3a
Component: cli
2013-03-13 00:29:40 -07:00
a59a03bb59 Merged master
Upstream-commit: a790f96feb
Component: cli
2013-03-12 21:53:34 -07:00
ab2846c881 Removed interactive mode ('docker -i'). Cool UI experiment but seems more trouble than it's worth
Upstream-commit: ae5f2d9a56
Component: cli
2013-03-12 15:05:41 -07:00
f9945bccac Put back the github.com path for the import
Upstream-commit: 20c2c684b2
Component: cli
2013-03-12 11:59:27 -07:00
ddc08abc64 Merge master within fs
Upstream-commit: c4a0001d99
Component: cli
2013-03-12 08:33:21 -07:00
cf4a1a8ac7 Automatically remove the rcfile generated by docker -i from /tmp
Upstream-commit: d895b3a7f8
Component: cli
2013-03-12 12:12:40 -07:00
45ad596952 Put back the relative paths for dev purpose
Upstream-commit: ab1211bcb8
Component: cli
2013-03-12 05:17:51 -07:00
4b2bbc5754 Change relative paths to absolute
Upstream-commit: 39ad2cf8d3
Component: cli
2013-03-11 02:59:52 -07:00
82b549063d post-merge repairs
Upstream-commit: b4b078c5ae
Component: cli
2013-03-11 07:39:06 -07:00
034971c8ee go fmt
Upstream-commit: df5134f46e
Component: cli
2013-02-26 17:26:46 -08:00
00a0161ee7 Interactive mode preserves existing PATH, to facilitate scripting
Upstream-commit: 754cf30b0e
Component: cli
2013-02-20 14:45:43 -08:00
2d5e2c98cb white space
Upstream-commit: 52fa34605c
Component: cli
2013-02-20 12:23:47 +00:00
477023814c make sure the standard "replace input carriage returns with line feeds" and "replace output line feeds with carriage return and line feed" flags are set, even on raw (I dont think it should actually be raw)
Upstream-commit: 4e24b235c3
Component: cli
2013-02-20 12:19:22 +00:00
066591d505 'docker start' and 'docker restart': start or restart a container
Upstream-commit: 29aab0e4bf
Component: cli
2013-02-14 13:49:05 -08:00
cb4e2fcf43 Moved server and client logic into sub-packages docker/server and docker/client, respectively. The UI is not affected.
Upstream-commit: f5594142a8
Component: cli
2013-02-13 17:10:00 -08:00