2a6be2d202
Check that the pid in pidfile exists before preventing docker to start
...
Upstream-commit: f079fbe3fa90d58d414341bed5246539c89b61b2
Component: engine
2013-04-22 15:57:31 -07:00
630116b2c0
Remove the NO_MEMORY_LIMIT constant
...
Upstream-commit: f68d107a1368b3d4f3342456a2b0675659688354
Component: engine
2013-04-18 21:08:20 -07:00
b71d622550
Disabled standalone mode ( fixes #364 )
...
Upstream-commit: 2a47df020246cc08a0b72cf355c9d803404245b3
Component: engine
2013-04-15 11:44:11 -07:00
3fcc60d0f7
Allow to disable memory limit at compilation time
...
Upstream-commit: 1967c8342aef1a81eb33a41d673bb8e702daa5df
Component: engine
2013-04-12 10:48:20 -07:00
ebb6835d20
Go fmt
...
Upstream-commit: 22893429ed29dbb7a01eed7a90a4d1fbecfd5d90
Component: engine
2013-04-12 07:37:24 -07:00
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
2c9d6a2303
Move DockerLocalConn and terminal functions form package "main" to "rcli" in order to be able to use DockerLocalConn in commands_test.go
...
Upstream-commit: 246eed52de1038ccec462e500b942711735a7c24
Component: engine
2013-04-08 15:58:09 -07:00
e262b369bb
Simplification in the goroutine that restore the terminal state on SIGINT
...
Upstream-commit: b306a6073882e7995d74801d77d7baca4b12ec86
Component: engine
2013-04-08 15:58:09 -07:00
7815b9b259
Only set the terminal in raw mode for commands which need it
...
The raw mode is actually only needed when you attach to a container.
Having it enabled all the time can be a pain, e.g: if docker crashes
your terminal will end up in a broken state.
Since we are currently missing a real API for the docker daemon to
negotiate this kind of options, this changeset actually enable the raw
mode on the login (because it outputs a password), run and attach
commands.
This "optional raw mode" is implemented by passing a more complicated
interface than io.Writer as the stdout argument of each command. This
interface (DockerConn) exposes a method which allows the command to set
the terminal in raw mode or not.
Finally, the code added by this changeset will be deprecated by a real
API for the docker daemon.
Upstream-commit: 7d0ab3858e51a2cea244da72bb842fe15a5a9ded
Component: engine
2013-04-08 15:58:09 -07:00
a5a58e7b30
The flag to use a pre-existing bridge interface is '-b'. Added explanation
...
Upstream-commit: 22adb52c0aaf4ff53d37eb45566d6aeeb907ed09
Component: engine
2013-04-05 14:16:04 -07:00
5140fcb35f
Move the default bridge name to a constant
...
Upstream-commit: 1b370f9d8dbd1c476db766e8587617e795570d97
Component: engine
2013-04-04 05:33:28 -07:00
ae8058f403
Put the bridge interface name in the command line
...
Upstream-commit: f39af7e05da437d6ac95b19ccfa401598d1fb5d9
Component: engine
2013-04-03 16:15:43 -07:00
ca62613e60
Merged shawnsi/git-version
...
Upstream-commit: 35c68944c7a5c7b7778c6cdb54b149e22c4c0c64
Component: engine
2013-04-02 20:26:22 -07:00
96ec0e911c
Use an environment variable to activate debug mode, instead of a package-specific flag
...
Upstream-commit: 76663079312bb501f545823d9650df9eeda2c882
Component: engine
2013-04-02 10:58:16 -07:00
5f6e565b52
Adding git commit to the version output
...
The Makefile must be used in order to inject the git commit
via -ldflags.
Upstream-commit: 37a78902db9e968d307d0c0325612e8bef20bc69
Component: engine
2013-04-01 13:52:45 -05:00
e3924816a0
Merged Ctrl-C interception by @creack
...
Upstream-commit: c937e237ad0625fc0ae8049e745bf599c27b0af8
Component: engine
2013-03-29 13:12:04 -07:00
3e91a54abc
Camelize some snake_case variable names
...
Upstream-commit: a6da7f138c0b260d560c63e234c87db0f5c72bb1
Component: engine
2013-03-28 20:12:23 -04:00
22d5f7d988
Change hardcoded "0" onto os.Stdin.Fd()
...
Upstream-commit: 6a236184af6ae57e2f7475e9ab279b0684a869d4
Component: engine
2013-03-27 23:56:36 -07:00
3ebc70c951
#214 Better signal handling
...
Upstream-commit: 108acc0511fde98a8b5035d9ea7256d5449bb034
Component: engine
2013-03-27 23:54:53 -07:00
71cb06de21
Add a Debugf() helper and a -D (debug) flag to docker
...
Upstream-commit: 6e507b9460b81e830ef2f5d10035d08e3948fe4d
Component: engine
2013-03-22 11:44:12 -07:00
69e910efff
Moved Go() to the main package... And got rid of the useless docker/future package
...
Upstream-commit: 623e91e2e3f3d0b408a43606df8d3c037a6b03be
Component: engine
2013-03-21 01:13:55 -07:00
9ee9057ed1
Move commands into docker
...
Upstream-commit: e5e66716df901bcc40106497532b9c3bff0bb931
Component: engine
2013-03-14 02:43:16 -07:00
621d110d7f
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: 745edc49cdcf0dc02fe714b0772f146fc8a66d23
Component: engine
2013-03-13 00:29:40 -07:00
95b2e5b159
Merged master
...
Upstream-commit: 86854ffbc5423597d11932eb904cb6fe7dedcac9
Component: engine
2013-03-12 21:53:34 -07:00
547e13b585
Removed interactive mode ('docker -i'). Cool UI experiment but seems more trouble than it's worth
...
Upstream-commit: d2cba75d5f1e8ceea7f301ef146c571806252fa0
Component: engine
2013-03-12 15:05:41 -07:00
35529bba2c
Put back the github.com path for the import
...
Upstream-commit: 453d49573c91a1c49ffbc54d040145804e38d91e
Component: engine
2013-03-12 11:59:27 -07:00
b9140244d5
Put back the relative paths for dev purpose
...
Upstream-commit: 18f4e7e196eb894765094c1291e1a1f6599f4266
Component: engine
2013-03-12 05:17:51 -07:00
c28aedcbf3
Change relative paths to absolute
...
Upstream-commit: 687d6f25eeb8f4bc505dc9c6c0d9ea305c824e2d
Component: engine
2013-03-11 02:59:52 -07:00
3720d832c1
post-merge repairs
...
Upstream-commit: 5d6199b9251261216cb096cd919e3cc5eb3efdd6
Component: engine
2013-03-11 07:39:06 -07:00
d2bed9b75c
go fmt
...
Upstream-commit: aa12da6f5076738955b30470639d439a0cbe40f9
Component: engine
2013-02-26 17:26:46 -08:00
e924ec5591
Moved server and client logic into sub-packages docker/server and docker/client, respectively. The UI is not affected.
...
Upstream-commit: e1b25e9b084a2375640b811a27b75b89d57666d9
Component: engine
2013-02-13 17:10:00 -08:00
47b5079cb2
'docker -i' can be used as an interpreter for scripts (#!/usr/bin/env docker -i)
...
Upstream-commit: 45c30b8eda828a65f509e774e93d54ec1af969a7
Component: engine
2013-02-12 22:24:15 -08:00
e6faaa4b36
Clean up list of available commands
...
Upstream-commit: f20deac47f35520ace5ad1c1aadbd3f8c34ad571
Component: engine
2013-02-12 17:25:41 -08:00
7272cb93ab
docker -i: interactive mode
...
Upstream-commit: d0b6f7ef3bebc4dac8f93b3782f58af2e1a94407
Component: engine
2013-02-12 08:48:30 -08:00
2d49a43787
Disabled remote access to dockerd. Preferred usage is over ssh.
...
Upstream-commit: f330c2a2488b6c26973f0b0fb8da5115588b7f72
Component: engine
2013-02-12 08:37:12 -08:00
c8f28dfa5c
Clearer error message in the client when DOCKER env variable is not set
...
Upstream-commit: edc996860496f63b8e4eb786890e8ba2bab7e875
Component: engine
2013-02-04 23:25:28 -08:00
2c15ec4bf8
Fix a bug which caused the client to never exit in interactive mode when NORAW is set.
...
Upstream-commit: d5be77075a6e3dbc8ea167d4c5ab60663b0dbe68
Component: engine
2013-01-29 15:37:54 -08:00
9aed505733
export NORAW=1 to disable raw mode in the client
...
Upstream-commit: 8c142c612737f45fb97d9ad949b1c3bd42d38c71
Component: engine
2013-01-29 15:24:39 -08:00
9f3880a4db
Fixed typo in Darwin termios settings
...
Upstream-commit: c283ff667550d6e86a7bcc16259c796f4261be6e
Component: engine
2013-01-28 18:37:54 -08:00
e0d4eb7361
Forgot an import in termios_darwin
...
Upstream-commit: c914aaf43e9eea2e67f42fc93667a40c36b6cd35
Component: engine
2013-01-28 17:07:38 -08:00
0922b8dd16
Different termios for linux/darwin
...
Upstream-commit: 08ac1d0b3543b9ab98b2cbeaea6bb9512d6a14b5
Component: engine
2013-01-28 17:06:46 -08:00
34fa02708d
Fixed IO edge cases on docker client. Wait for stdin to close before exiting if it's a pipe, but not if it's a terminal. Correctly send stdin EOF to the server with TCP half-close
...
Upstream-commit: 75529a202f65e7df5395e0eca7d58aaa7718489c
Component: engine
2013-01-25 11:26:18 -08:00
9dc7d71f11
Factored out docker/rcli (remote cli protocol), docker/fake (mocking utilities) and docker/future (real utilities which don't yet fit in the core)
...
Upstream-commit: f3ffba7afef9d5caf5eca47e23eda0a2974dd04d
Component: engine
2013-01-24 20:01:32 -08:00
9772e0b30b
Enabled stdin and interactive mode. 'docker run -a CONTAINER bash' will now correctly run an interactive shell. This required switching to a simple raw TCP protocol by default
...
Upstream-commit: 553ca56d7ed6f5808c97356b9bd4f6a5a3d20477
Component: engine
2013-01-23 23:14:46 -08:00
805b157702
Moved 100% of arg parsing to dockerd. Even help messages are generated on the server
...
Upstream-commit: d62a759106f2aba2f2d74ec864e05b297eb573cc
Component: engine
2013-01-20 00:44:44 -08:00
6aa1981e91
CLI: don't crash with no arguments
...
Upstream-commit: 3dc240c7eedd8d47d91704cf378d76658856fe79
Component: engine
2013-01-19 17:41:59 -08:00
89000a0f7c
Prototyping with a mock CLI and daemon
...
Upstream-commit: e5323e7c9ab02c64e57396807d5b29b42d1f3904
Component: engine
2013-01-19 16:07:19 -08:00
