docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,393 Commits 21 Branches 28 Tags 816 MiB
Commit Graph

10393 Commits

Author SHA1 Message Date
Victor Vieux a7d116f1b0 Merge pull request #7573 from vieux/remove_double_newline 
remove double newline
 2014-08-13 23:24:30 -07:00
Andy Rothfusz 31a9c97d7d Merge pull request #7544 from metalivedev/fixmailmap 
Fix my email entry. FIxing email entry.
 2014-08-13 20:05:56 -07:00
Sven Dowideit f945edb3e0 Merge pull request #7532 from ChristopherBiscardi/shiftWindow 
Remove Old shiftWindow()
 2014-08-14 12:48:19 +10:00
Victor Vieux a0392324f1 another commit to do like @crosbymichael 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-08-14 01:36:26 +00:00
Michael Crosby 5ad4879d2a Update flag usages and docs for max restart count 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 18:24:33 -07:00
Victor Vieux fcf37be2b1 remove double newline 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-08-14 01:08:27 +00:00
Jim Perrin d939fe758a Updated CentOS documentation to reflect CentOS 7 install. 
Added reference to CentOS Dockerfiles on github.

Signed-off-by: Jim Perrin <jperrin@centos.org> (github: jperrin)
 2014-08-13 19:06:53 -05:00
Michael Crosby b95f6c183b Merge pull request #7414 from crosbymichael/auto-restart 
Auto restart containers based on restart policy
 2014-08-13 16:17:51 -07:00
Michael Crosby 25c519e829 Deprecate --restart on the daemon 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 16:08:50 -07:00
Michael Crosby 73ced63680 Update based on comments from the code review 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 15:58:55 -07:00
Michael Crosby 2ec1b697c1 Rebased changes to return on first start's error 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 15:58:55 -07:00
Michael Crosby ebf5d4657d Reguardless of success reset time increment 
Reset the time increment if the container's execution time is greater
than 10s or else as a container runs and is restarted the time will grow
overtime.

Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 15:58:54 -07:00
Michael Crosby 972c894931 Improve wait during restart 
We need to do this so that when a user asks docker to stop the container
and it is currently in the restart loop we don't want to have to wait
for the duration of the restart time increment before ack. the stop.

Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 15:58:54 -07:00
Michael Crosby c4a00d549d Honor the restarting state in Stop 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 15:58:54 -07:00
Michael Crosby a2afb2b1e3 Add Restarting state when docker is handling the restart of containers 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 15:58:54 -07:00
Michael Crosby be22d7ac2d Add additional comments for vague lines 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 15:58:54 -07:00
Michael Crosby 6ae05936e1 Move container start event into monitor 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 15:58:54 -07:00
Michael Crosby b7550cd456 Fix rebase around log event 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 15:58:54 -07:00
Michael Crosby feda8fbb21 Restart conatiner with on-failure policy if exit code != 0 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 15:58:54 -07:00
Michael Crosby 41870a42be Only restart containers on daemon load with policy of always 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 15:58:54 -07:00
Michael Crosby 617edd89f4 Update docs based on feedback from review for --restart 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 15:57:37 -07:00
Michael Crosby 860c13b788 Add documentation and update restart rules. 
Implement time backed backoff for restarting and fix failure count when
the maximum is 0

Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 15:57:37 -07:00
Michael Crosby 2b0776c883 Refactor container monitor into type 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 15:56:53 -07:00
Michael Crosby d9753ba20d Add typed RestartPolicy 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 15:56:34 -07:00
Michael Crosby e0a076d486 Cleanup restart logic in monitor 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 15:56:34 -07:00
Michael Crosby bd8c9dc239 Restart containers based on restart policy 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 15:56:34 -07:00
Tibor Vass 0d70706b4b Merge pull request #7569 from erikh/pkg_log 
Cleanup: Extract log utils into pkg/log
 2014-08-13 18:43:08 -04:00
Victor Vieux 6b363b81de Merge pull request #7572 from shykes/workaround-api-shutdown 
Workaround to avoid 5 second delay on graceful daemon restart
 2014-08-13 15:41:33 -07:00
Erik Hollensbe ac63d925d2 move utils.Fataler to pkg/log.Fataler 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-08-13 15:32:41 -07:00
Josiah Kiehl a02f67be5b Extract log utils into pkg/log 
Docker-DCO-1.1-Signed-off-by: Josiah Kiehl <josiah@capoferro.net> (github: capoferro)
 2014-08-13 15:18:15 -07:00
Victor Vieux 13eb477b62 Merge pull request #7506 from shykes/cleanup-daemonconfig 
Cleanup: refactor parsing and handling of Daemon config
 2014-08-13 15:07:13 -07:00
Solomon Hykes 6aecdb4f8e Workaround to avoid 5 second delay on graceful daemon restart 
Signed-off-by: Solomon Hykes <solomon@docker.com>
 2014-08-13 21:40:25 +00:00
Michael Crosby fd1b563b4f Merge pull request #7548 from crosbymichael/proxy-exec 
Move userland proxies out of daemon process
 2014-08-13 14:03:40 -07:00
Solomon Hykes 2837a36bd7 Merge pull request #7570 from erikh/remove_fixme 
Remove FIXME file
 2014-08-13 13:55:20 -07:00
Olivier Gambier 49c43004a7 Merge pull request #7194 from vbatts/vbatts-registry_re-org 
registry: cleanup and rename Registry -> Session
 2014-08-13 13:37:56 -07:00
Tibor Vass 0c6b137f06 Merge pull request #7484 from cpuguy83/cleanup_volume_init 
Cleanup: initializeVolume
 2014-08-13 16:18:02 -04:00
Brian Goff e350df5b2c Cleanup: initializeVolume 
- Use a common struct for Volumes
- Split out some functionality in intializeVolume into separate functions
- Removes some duplicate code
- In general much easier to grok the code now

Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
 2014-08-13 15:55:59 -04:00
Erik Hollensbe 7bfc78b038 Remove FIXME file 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-08-13 12:49:12 -07:00
Solomon Hykes a30fd7a962 Fix inconsistency in IP address parsing errors 
Signed-off-by: Solomon Hykes <solomon@docker.com>
 2014-08-13 19:25:51 +00:00
Solomon Hykes 1d10c55aec Move remote API config out of daemon/ 
Signed-off-by: Solomon Hykes <solomon@docker.com>
 2014-08-13 19:25:51 +00:00
Solomon Hykes 1eba59eb24 Check for conflicting daemon config options in NewDaemon 
Signed-off-by: Solomon Hykes <solomon@docker.com>
 2014-08-13 19:25:51 +00:00
Solomon Hykes ca11b77471 opts.IPVal returns an error on incorrect input 
Signed-off-by: Solomon Hykes <solomon@docker.com>
 2014-08-13 19:25:51 +00:00
Solomon Hykes 353b7c8ec7 Parse daemon configuration in daemon.Config.InstallFlags instead of main 
Signed-off-by: Solomon Hykes <solomon@docker.com>
 2014-08-13 19:25:51 +00:00
Solomon Hykes 6200002669 Helpers to parse lists, IPs, hosts, dns searches from the command line 
Signed-off-by: Solomon Hykes <solomon@docker.com>
 2014-08-13 19:25:47 +00:00
Michael Crosby 33fa175abf Merge pull request #7568 from crosbymichael/replace-7240 
Exit after receiving SIGTERM
 2014-08-13 12:23:34 -07:00
Michael Crosby cdf8a55670 Exit after receiving SIGTERM 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 12:18:23 -07:00
Solomon Hykes 6d59a56675 opts.IpOpt: a helper to parse IP addressed from the command line 
Signed-off-by: Solomon Hykes <solomon@docker.com>
 2014-08-13 19:09:51 +00:00
Solomon Hykes a4befff533 Move daemonconfig into daemon 
Signed-off-by: Solomon Hykes <solomon@docker.com>
 2014-08-13 19:09:51 +00:00
Michael Crosby b4e2f5ed96 Move userland proxies out of daemon's process 
This PR moves the userland proxies for TCP and UDP traffic out of the
main docker daemon's process ( from goroutines per proxy ) to be a
separate reexec of the docker binary.  This reduces the cpu and memory
needed by the daemon and if the proxy processes crash for some reason
the daemon is unaffected.  This also displays in the standard process
tree so that a user can clearly see if there is a userland proxy that is
bound to a certain ip and port.

```bash
CONTAINER ID        IMAGE                       COMMAND             CREATED             STATUS              PORTS                                          NAMES
5d349506feb6        busybox:buildroot-2014.02   "sh"                13 minutes ago      Up 1 seconds        0.0.0.0:49153->81/tcp, 0.0.0.0:49154->90/tcp   hungry_pike
root@1cbfdcedc5a7:/go/src/github.com/docker/docker# ps aux
USER       PID %CPU %MEM    VSZ   RSS TTY      STAT START   TIME COMMAND
root         1  0.0  0.1  18168  3100 ?        Ss   21:09   0:00 bash
root      8328  0.7  0.6 329072 13420 ?        Sl   22:03   0:00 docker -d -s vfs
root      8373  1.0  0.5 196500 10548 ?        Sl   22:03   0:00 userland-proxy -proto tcp -host-ip 0.0.0.0 -host-port 49153 -container-ip 10.0.0.2 -container-port 81
root      8382  1.0  0.5 270232 10576 ?        Sl   22:03   0:00 userland-proxy -proto tcp -host-ip 0.0.0.0 -host-port 49154 -container-ip 10.0.0.2 -container-port 90
root      8385  1.2  0.0   3168   184 pts/0    Ss+  22:03   0:00 sh
root      8408  0.0  0.1  15568  2112 ?        R+   22:03   0:00 ps aux
```

This also helps us to cleanly cleanup the proxy processes by stopping
these commands instead of trying to terminate a goroutine.

Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 11:54:47 -07:00
Victor Vieux c9c271858a Merge pull request #6162 from vbatts/vbatts-ps_filter 
docker ps: introducing filters
 2014-08-13 11:44:48 -07:00