Brian Olsen
25c4c87c86
Support copying value from env with -e option.
2013-10-31 01:19:09 +01:00
Brian Olsen
be7eb4bfcb
Set environment variables using a file.
2013-10-31 00:48:12 +01:00
Michael Crosby
746ba127bf
Hotfix: Migrate public mappings after upgrade
2013-10-30 08:15:12 -07:00
Victor Vieux
e0b59ab52b
Enable sig-proxy by default in run and attach
2013-10-29 11:18:34 -07:00
Michael Crosby
0d2924408b
Add -name for docker run
...
Remove docker link
Do not add container id as default name
Create an auto generated container name if not
specified at runtime.
2013-10-28 18:09:08 -07:00
Tianon Gravi
cf86e2bb22
Rename all cases of "docker-init" to "dockerinit" for consistency
2013-10-25 15:13:25 -07:00
Alexander Larsson
d063c8d941
Move ListOps to utils submodule
...
This will be needed for later use in docker-init without a docker
dependency
2013-10-25 15:13:24 -07:00
Michael Crosby
1cbdaebaa1
Add links for container relationships and introspection
2013-10-25 15:13:24 -07:00
Michael Crosby
ff567f8729
Merge pull request #2385 from dotcloud/suppress_even_more_warnings_test
...
Improve tests again, remove warnings and prevent some mount issues
2013-10-25 15:04:56 -07:00
Victor Vieux
a675e249b1
fix workdir, hostname tests and a bunch on mount issue
2013-10-24 16:57:35 -07:00
Jérôme Petazzoni
b9eb5e04ae
Ignore ErrClosedPipe for stdin in Container.Attach.
...
But pass `err` in the error channel anyway; don't ignore it anymore.
2013-10-24 15:04:58 -07:00
Victor Vieux
10e10c9573
fix race condition in docker build with verbose + cleanup hostIntegration debug
2013-10-22 15:01:06 -07:00
Guillaume J. Charmes
3e014aa662
Fix attach race condition, improve unit tests, make sure the container is started before unblocking Start
2013-10-18 16:26:16 -07:00
Guillaume J. Charmes
333bc23f21
Fix issue killing container while sending signal
...
Fix rebase issue
Update docs
2013-10-18 16:19:27 -07:00
Guillaume J. Charmes
4918769b1a
Add -nostdin and -proxy to docker attach, allow arbirary signal to be sent via docker kill api endpoint
...
Allow attach from `docker start`
Add host integration script generation
Update doc with host integration
2013-10-18 16:16:29 -07:00
Guillaume J. Charmes
e9ee860c91
Merge branch 'master' into dm
...
Conflicts:
Dockerfile
buildfile.go
container.go
hack/make/test
runtime_test.go
utils/utils.go
2013-10-18 12:38:29 -07:00
Guillaume J. Charmes
c2175ae736
Switch back some Errorf to Debugf.
2013-10-18 12:29:16 -07:00
Michael Crosby
3ba9893786
Merge pull request #2242 from jpetazzo/remove-spurious-errors-and-errclosedpipe
...
Fix error/debug messages in Container.Attach and recover from ErrClosedPipe
2013-10-16 17:27:23 -07:00
Victor Vieux
e40fd1e3e1
fix panic
2013-10-16 21:39:03 +00:00
Guillaume J. Charmes
ed6ca109bf
Refactor container.Start()
2013-10-16 13:12:56 -07:00
Victor Vieux
664acd2971
Add clean if start fail
2013-10-16 19:48:24 +00:00
Jérôme Petazzoni
fc659b68e4
Fix error/debug messages in Container.Attach and recover from ErrClosedPipe conditions.
2013-10-16 11:35:45 -07:00
Michael Crosby
80bd64245f
Add filesystemtype for containers
...
If no type is specified then assume aufs.
2013-10-15 11:49:13 -07:00
Karl Grzeszczak
ad723bbfe7
Initial steps to fix Issue #936
...
Use utils.Errorf instead of utils.Debugf
2013-10-11 08:04:40 -05:00
Solomon Hykes
1804fcba93
Merged master into device-mapper branch
2013-10-10 12:50:30 -07:00
Zilin Du
c2912c82aa
change 127.0.0.1 -> 127.0.1.1 & remove ::1 -> hostname mapping
2013-10-10 09:44:48 -07:00
Zilin Du
7d95d300ab
replace 127.0.0.1 by the assigned IP address in the container's /etc/hosts file.
2013-10-08 14:29:22 -07:00
Victor Vieux
152302e379
go fmt and aufs support removed
2013-09-30 17:35:02 -06:00
Alexander Larsson
b0a9147fd5
runtime test: Ensure all containers are unmounted at nuke()
...
Otherwise we may leave around e.g. devmapper mounts
2013-09-30 17:35:02 -06:00
Alexander Larsson
43a7d3d0e9
Add trivial copy-based CoW backend
...
This creates a container by copying the corresponding files
from the layers into the containers. This is not gonna be very useful
on a developer setup, as there is no copy-on-write or general diskspace
sharing. It also makes container instantiation slower.
However, it may be useful in deployment where we don't always have a lot
of containers running (long-running daemons) and where we don't
do a lot of docker commits.
2013-09-30 17:35:01 -06:00
Alexander Larsson
429587779a
lxc: Work around lxc-start need for private mounts
...
lxc-start requires / to be mounted private, otherwise the changes
it does inside the container (both mounts and unmounts) will propagate
out to the host.
We work around this by starting up lxc-start in its own namespace where
we set / to rprivate.
Unfortunately go can't really execute any code between clone and exec,
so we can't do this in a nice way. Instead we have a horrible hack that
use the unshare command, the shell and the mount command...
2013-09-30 17:35:01 -06:00
Alexander Larsson
c138801073
Container: Inject into the mount, not the rwPath
...
For device-mapper setups we can't just push the file into the rwPath.
2013-09-30 17:35:01 -06:00
Alexander Larsson
b0626f403b
Implement container.ExportRW() on device-mapper
2013-09-30 17:34:59 -06:00
Alexander Larsson
fda6ff9c27
Make TarFilter more useful
...
There are a few changes:
* Callers can specify if they want recursive behaviour or not
* All file listings to tar are sent on stdin, to handle long lists better
* We can pass in a list of filenames which will be created as empty
files in the tarball
This is exactly what we want for the creation of layer tarballs given
a container fs, a set of files to add and a set of whiteout files to create.
2013-09-30 17:34:59 -06:00
Alexander Larsson
1c5dc26a7c
Implement docker diff for device-mapper
...
To do diffing we just compare file metadata, so this relies
on things like size and mtime/ctime to catch any changes.
Its *possible* to trick this by updating a file without
changing the size and setting back the mtime/ctime, but
that seems pretty unlikely to happen in reality, and lets
us avoid comparing the actual file data.
2013-09-30 17:34:59 -06:00
Alexander Larsson
a9ec1dbc9b
Image: Deactivate image device when unmounting container
...
There is no need to keep all the device-mapper devices active, we
can just activate them on demand if needed.
2013-09-30 17:34:59 -06:00
Alexander Larsson
e368c8bb01
Image: Add runtime and container id args to Mount()
...
We will later need the runtime to get access to the VolumeSet
singleton, and the container id to have a name for the volume
for the container
2013-09-30 17:34:58 -06:00
Victor Vieux
bcce3cbdd1
Merge pull request #1995 from dotcloud/fix_attach_2
...
Fix the attach behavior with -i
2013-09-30 03:29:19 -07:00
Guillaume J. Charmes
537149829a
Fix the attach behavior with -i
2013-09-27 11:10:55 -07:00
Michael Crosby
723de87681
Move run -rm to the cli only
2013-09-26 14:52:37 -07:00
Michael Crosby
db869ecce5
Merge pull request #1589 from unclejack/479-add_rm_support_to_docker_run
...
Add -rm to docker run for removing a container on exit
2013-09-27 11:45:32 -07:00
unclejack
22e7e107ad
automatically remove container via -rm
...
add AutoRemove to HostConfig
add -rm flag to docker run
add TestRunAutoRemove to test -rm
docs: add -rm to commandline/command/run
add hostConfig to container monitor
make monitor destroy the container via -rm
This adds support for automatically removing a container after it
exits. The removal of the container is handled on the server side.
2013-09-27 17:43:12 +03:00
Alexander Larsson
c1c74cb0b1
Container: Always create a new session for the container
...
We never want the container to be in the same process group as the
daemon, as then the container will receive signals sent to the
process group of the container.
2013-09-24 14:57:29 +02:00
Victor Vieux
2fafe1efce
Merge pull request #1948 from dotcloud/fix_attach
...
Fix attach issue
2013-09-23 02:15:51 -07:00
Michael Crosby
23cf3c7a33
Merge pull request #1934 from dotcloud/host-permissions
...
Only copy files and change permissions with non bindmount
2013-09-22 09:40:52 -07:00
Guillaume J. Charmes
e97364ecd7
Improve detach unit tests
2013-09-20 13:36:19 -07:00
Guillaume J. Charmes
2bd089dadb
Fix attach issue
2013-09-20 11:31:00 -07:00
Michael Crosby
b45e280ee8
Only copy files and change permissions with non bindmount
2013-09-19 20:35:05 -07:00
Guillaume J. Charmes
68074fce68
Merge pull request #1886 from dotcloud/multi-volumes-from
...
* Runtime: Allow multiple volumes-from
2013-09-19 12:01:12 -07:00
Michael Crosby
45b50730e3
Merge pull request #1849 from dotcloud/better_handle_hostConfig
...
Improved hostConfig reload
2013-09-16 10:48:53 -07:00
Michael Crosby
b79bd4e864
Allow multiple volumes-from
2013-09-14 20:09:15 +00:00
Michael Crosby
b986fd00e0
Merge pull request #1846 from dotcloud/fix_return_error
...
Fix wrong return error
2013-09-13 09:44:38 -07:00
Brian Olsen
9cfbaecfe5
Transfer uid and gid to volume. Fixes #1737 .
2013-09-11 03:17:42 +02:00
Victor Vieux
f482432a76
improved hostConfig reload
2013-09-10 22:13:15 +00:00
Victor Vieux
44d0f941f2
fix wrong return error
2013-09-10 17:16:59 +00:00
Victor Vieux
27ca0c225a
Merge branch '1582_fix_volume_content' of https://github.com/griff/docker into griff-1582_fix_volume_content
2013-09-10 16:52:46 +00:00
Michael Crosby
e89396809f
Merge pull request #1735 from dotcloud/1301-support-domainname
...
Add domain name support
2013-09-09 17:21:11 -07:00
Victor Vieux
4f2e59f94a
bind mount /etc/hosts and /etc/hostname
2013-09-09 20:29:57 +00:00
Victor Vieux
0a436e03b8
add domainname support
2013-09-09 20:29:06 +00:00
shin-
2ea52dddec
Merge branch 'better_api_ports' of git://github.com/shin-/docker into shin--better_api_ports
2013-09-04 22:25:01 +02:00
Brian Olsen
7a9c711832
Copies content from image to volumne if non-empty. Fixes #1582 .
2013-08-30 22:02:05 +02:00
Brian Olsen
6756e786ac
Just fixing gofmt issues in other people's code.
2013-08-30 22:02:05 +02:00
Victor Vieux
eee6d3dae9
add TEST env var during tests and silenced parserun during tests
2013-08-29 22:55:29 +00:00
shin-
98018df078
More descriptive, easier to process container portmappings information in the API
2013-08-28 00:20:35 +02:00
Michael Crosby
c2b273df5d
Merge pull request #1611 from pysqz/master
...
Make sure 'Ghost' container is available with allocated IP
2013-08-27 11:30:00 -07:00
pysqz
cc18a9c650
Also reuse forwarding ports
2013-08-28 03:14:21 +08:00
Michael Crosby
551092f9c0
Add lxc-conf flag to allow custom lxc options
2013-08-22 16:05:21 +00:00
pysqz
2f6ce27fde
Make sure 'Ghost' container is available with allocated IP
2013-08-21 22:37:58 +08:00
Victor Vieux
b21f898620
assume ip_forwarding = 1 by default
2013-08-19 12:34:30 +00:00
Marco Hennings
687d27ab57
Add an option to set the working directory.
...
This makes it possible to simply wrap a command inside a container. This makes
it easier to use a container as an unified build environment.
Examples:
~/workspace/docker
$ docker run -v `pwd`:`pwd` -w `pwd` -i -t ubuntu ls
AUTHORS Makefile archive.go changes.go docker
[...]
docker run -v `pwd`:`pwd` -w `pwd` -i -t ubuntu pwd
/home/marco/workspace/docker
2013-08-18 19:34:01 +02:00
Michael Crosby
15bc2240ac
Merge pull request #1505 from dotcloud/improve_events
...
Add image name in /events
2013-08-14 15:40:36 -07:00
Guillaume J. Charmes
631c449183
Merge pull request #1496 from xdissent/1351-volumes-from-before-volumes
...
* Runtime: Apply volumes-from before creating volumes
2013-08-14 15:10:41 -07:00
Jérôme Petazzoni
280901e5fb
add -insecure flag and relevant tests
2013-08-13 16:20:22 -07:00
Victor Vieux
703905d7ec
ensure the use oh IDs and add image's name in /events
2013-08-12 11:50:03 +00:00
Greg Thornton
57b49efc98
Skip existing volumes in volumes-from
...
Removes the error when a container already has a volume that would otherwise
be created by `Config.VolumesFrom`. Allows restarting containers with a
`Config.VolumesFrom` set.
2013-08-10 06:37:57 +00:00
Greg Thornton
3bd73a9633
Apply volumes-from before creating volumes
...
Copies the volumes from the container specified in `Config.VolumesFrom` before
creating volumes from `Config.Volumes`. Skips any preexisting volumes when
processing `Config.Volumes`. Fixes #1351
2013-08-10 04:55:23 +00:00
Colin Rice
10190be5d7
Add warning when net.ipv4.ip_forwarding = 0
...
Added warnings to api.go, container.go, commands.go, and runtime.go
Also updated APIInfo to return whether IPv4Forwarding is enabled
2013-08-07 18:28:39 -04:00
Michael Crosby
d94b186080
Strip leading forward slash from resource
2013-08-06 16:09:54 +00:00
Michael Crosby
5b8cfbe15c
Add cp command and copy api endpoint
...
The cp command and copy api endpoint allows users
to copy files and or folders from a containers filesystem.
Closes #382
2013-08-06 16:09:54 +00:00
Guillaume J. Charmes
f6fa353dd8
Merge pull request #1267 from sridatta/new-clean-init
...
* Runtime: Fix to "Inject dockerinit at /.dockerinit"
2013-08-05 13:23:22 -07:00
Guillaume J. Charmes
29de2432ea
Merge pull request #1350 from ndarilek/1348-add-hostname-to-environment
...
Runtime: add hostname to environment
2013-08-02 13:58:43 -07:00
Nolan
9a604acc23
Add hostname to the container environment.
2013-07-31 09:50:53 -05:00
Victor Vieux
cd9f7f29d1
Merge pull request #1334 from dotcloud/1314-compat_broke-fix
...
Discard error when loading old container format
2013-07-31 01:08:08 -07:00
Thatcher Peskens
5dc86d7bca
Updated the description of run -d
...
The goal is to make it more clear this will give you the container id after run completes.
Since stdout is now standard on run, "docker run -d" is the best (or only) way to get the container ID returned from docker after a plain run, but the description (help) does not hint any such thing.
2013-07-29 14:17:15 -07:00
Victor Vieux
b2aa877bf0
fix #1314 discard error when loading old container format
2013-07-29 16:40:35 +00:00
Mike Gaffney
4ebe2cf348
Change reserve-compatibility to reverse-compatibility
2013-07-26 01:10:42 -07:00
Guillaume J. Charmes
fd9ad1a194
Fixes #505 - Make sure all output is send on the network before closing
2013-07-24 15:48:51 -07:00
Victor Vieux
ee05f97c9a
Merge branch 'master' into 1167_events_endpoint-feature
2013-07-24 11:49:04 +00:00
Victor Vieux
a41384ad73
add die event
2013-07-23 15:42:34 +00:00
Victor Vieux
8165e51ecc
Merge branch '858-disable-network-configuration' of https://github.com/stfp/docker into stfp-858-disable-network-configuration
2013-07-23 08:44:12 +00:00
Stefan Praszalowicz
bc172e5e5f
Invert network disable flag and logic (unbreaks TestAllocate*PortLocalhost)
2013-07-22 19:00:35 -07:00
Victor Vieux
8ea9ccf3a7
Merge pull request #1244 from dotcloud/1020_add_variable
...
*Runtime: Add container=lxc in default env
2013-07-22 09:17:30 -07:00
Stefan Praszalowicz
49673fc45c
Support completely disabling network configuration with docker -d -b none
2013-07-21 17:49:09 -07:00
Stefan Praszalowicz
3342bdb331
Support networkless containers with new docker run option '-n'
2013-07-21 17:11:47 -07:00
Victor Vieux
67f1e3f5ed
add container=lxc in default env
2013-07-19 17:22:16 +00:00
Victor Vieux
ea12588524
remove usage from tests
2013-07-19 15:56:00 +00:00
Victor Vieux
0bd534adcf
Merge pull request #1211 from dotcloud/new_logs
...
*Runtime: Logs are now synchronised
2013-07-19 06:43:29 -07:00
unclejack
64e74cefb7
add support for container ID files (a la pidfile)
2013-07-19 16:03:45 +03:00
Guillaume J. Charmes
d6fb313220
Merge pull request #1207 from crosbymichael/819-use-persistent-volume
...
* Runtime: Do not overwrite container volumes from config
2013-07-18 18:51:00 -07:00
Solomon Hykes
5d8efc107d
+ Runtime: inject dockerinit at /.dockerinit instead of overwriting /sbin/init. This makes it possible to run /sbin/init inside a container.
2013-07-17 17:13:34 -07:00
Guillaume J. Charmes
eefbadd230
Merge -b and -v options
2013-07-15 17:51:32 -07:00
Michael Crosby
92cbb7cc80
Do not overwrite container volumes from config
...
Fixes #819 Use same persistent volume when a container is restarted
2013-07-15 11:59:11 -09:00
Victor Vieux
599f85d4e4
store both logs in a same file, as JSON
2013-07-15 16:17:58 +00:00
Victor Vieux
5756ba9bc4
Merge branch 'master' into new_logs
2013-07-15 13:57:54 +00:00
Michael Crosby
5ae8c7a985
Copy VolumesRW values when using --volumes-from
...
Fixes #1201
2013-07-14 18:23:20 -09:00
Victor Vieux
a909223ee2
Merge pull request #1102 from dotcloud/1098-store_hostconfig_tmp
...
* Runtime: bind mounts are now preserved upon container restart
2013-07-12 05:04:10 -07:00
Victor Vieux
941e3e2ef0
wip
2013-07-11 17:18:28 +00:00
Victor Vieux
d918c7d9de
export portmapping in network.go
2013-07-10 14:09:35 +00:00
Louis Opter
fac0d87d00
Add support for UDP ( closes #33 )
...
API Changes
-----------
The port notation is extended to support "/udp" or "/tcp" at the *end*
of the specifier string (and defaults to tcp if "/tcp" or "/udp" are
missing)
`docker ps` now shows UDP ports as "frontend->backend/udp". Nothing
changes for TCP ports.
`docker inspect` now displays two sub-dictionaries: "Tcp" and "Udp",
under "PortMapping" in "NetworkSettings".
Theses changes stand true for the values returned by the HTTP API too.
This changeset will definitely break tools built upon the API (or upon
`docker inspect`). A less intrusive way to add UDP ports in `docker
inspect` would be to simply add "/udp" for UDP ports but it will still
break existing applications which tries to convert the whole field to an
integer. I believe that having two TCP/UDP sub-dictionaries is better
because it makes the whole thing more clear and more easy to parse right
away (i.e: you don't have to check the format of the string, split it
and convert the right part to an integer)
Code Changes
------------
Significant changes in network.go:
- A second PortAllocator is instantiated for the UDP range;
- PortMapper maintains separate mapping for TCP and UDP;
- The extPorts array in NetworkInterface is now an array of Nat objects
(so we can know on which protocol a given port was mapped when
NetworkInterface.Release() is called);
- TCP proxying on localhost has been moved away in network_proxy.go.
localhost proxy code rewrite in network_proxy.go:
We have to proxy the traffic between localhost:frontend-port and
container:backend-port because Netfilter doesn't work properly on the
loopback interface and DNAT iptable rules aren't applied there.
- Goroutines in the TCP proxying code are now explicitly stopped when
the proxy is stopped;
- UDP connection tracking using a map (more infos in [1]);
- Support for IPv6 (to be more accurate, the code is transparent to the
Go net package, so you can use, tcp/tcp4/tcp6/udp/udp4/udp6);
- Single Proxy interface for both UDP and TCP proxying;
- Full test suite.
[1] https://github.com/dotcloud/docker/issues/33#issuecomment-20010400
2013-07-09 17:42:35 -07:00
Victor Vieux
bf7d6cbb4a
rebase master
2013-07-08 13:26:29 +00:00
Caleb Spare
19121c16d9
Implement several golint suggestions, including:
...
* Removing type declarations where they're inferred
* Changing Url -> URL, Id -> ID in names
* Fixing snake-case names
2013-07-03 14:36:04 -07:00
Caleb Spare
1cf9c80e97
Mutex style change.
...
For structs protected by a single mutex, embed the mutex for more
concise usage.
Also use a sync.Mutex directly, rather than a pointer, to avoid the
need for initialization (because a Mutex's zero-value is valid and
ready to be used).
2013-07-02 15:53:08 -07:00
Victor Vieux
3042f11666
never remove the file and try to load it in start
2013-07-02 18:02:16 +00:00
Victor Vieux
27a137ccab
change file location
2013-07-02 17:02:42 +00:00
Victor Vieux
06b53e3fc7
store hostConfig to /tmp while container is running
2013-07-02 12:19:25 +00:00
Michael Crosby
b16ff9f859
Add Entrypoint to builder and container config
...
By setting an entrypoint in the Dockerfile this
allows one to run an image and only pass arguments.
2013-07-01 05:34:27 -09:00
Gabriel Monroy
67239957c9
- Fix a few bugs in external mount-bind integration
2013-06-26 15:10:38 -07:00
Solomon Hykes
d4e62101ab
* Runtime: better integration of external bind-mounts (run -b) into the volume subsystem (run -v)
2013-06-26 15:08:07 -07:00
Gabriel Monroy
4fdf11b2e6
+ Runtime: mount volumes from a host directory with 'docker run -b'
2013-06-26 15:07:31 -07:00
Victor Vieux
63e8a4ac74
Merge pull request #970 from titanous/go1.1-unreachable
...
Remove code unreachable using Go 1.1
2013-06-21 10:44:40 -07:00
unclejack
66910a7602
mark command as optional for docker run
2013-06-21 11:06:41 +03:00
Jonathan Rudenberg
50b70eeb68
Remove code unreachable using Go 1.1
2013-06-20 23:19:44 -04:00
Victor Vieux
ddf5a1940f
Merge branch 'master' into 22-add_sizes_images_and_containers-feature
2013-06-14 10:05:06 +00:00
Victor Vieux
697282d6ad
Merge pull request #804 from dotcloud/no_stdout_stale-fix
...
*Runtime: Fix stale command when stdout is not allocated
2013-06-13 04:22:29 -07:00
Guillaume J. Charmes
7169212683
Fix typo
2013-06-10 11:08:40 -07:00
Victor Vieux
bf63cb9045
bump to master again
2013-06-05 16:01:36 +00:00
Guillaume J. Charmes
63e80384ea
Fix nil pointer on some situatuion
2013-06-04 14:35:32 -07:00
Guillaume J. Charmes
7ef9833dbb
Put back panic for go1.0.3 compatibility
2013-06-04 14:26:40 -07:00
Victor Vieux
fd224ee590
linted names
2013-06-04 18:00:22 +00:00
Victor Vieux
86ada2fa5d
drop/omit
2013-06-04 13:51:12 +00:00
Victor Vieux
b515a5a9ec
go vet
2013-06-04 13:24:58 +00:00
Guillaume J. Charmes
0ca8844398
Fix stale command with stdout is not allocated
2013-06-03 17:39:29 -07:00
Victor Vieux
3afdd82e42
bump to master
2013-05-30 23:38:40 +00:00
Guillaume J. Charmes
88ef309a94
Finish resize implementation client and server
2013-05-24 14:44:16 -07:00
Guillaume J. Charmes
70d2123efd
Add resize endpoint to api
2013-05-23 19:33:28 -07:00
Victor Vieux
6fce89e60b
bump to master
2013-05-22 13:41:29 +00:00
Guillaume J. Charmes
2e69e1727b
Create a subpackage for utils
2013-05-14 22:37:35 +00:00
Victor Vieux
a91b710961
add sizes in images and containers
2013-05-13 15:14:20 +02:00
Jérôme Petazzoni
6f3e868a7b
Merge branch 'master' of github.com:dotcloud/docker into 471-cpu-limit
2013-05-10 14:44:50 -07:00
Jérôme Petazzoni
e36752e033
if -c is not specified, do not set cpu.shares (instead of using the default value of 1024)
2013-05-07 11:43:45 -07:00
Jérôme Petazzoni
efd9becb78
implement "-c" option to allocate a number of CPU shares to a container
2013-05-07 11:16:30 -07:00
Victor Vieux
10c0e99037
update to master
2013-05-07 19:23:50 +02:00
Guillaume J. Charmes
9db4972a70
Make sure the destination directory exists when using docker insert
2013-05-06 16:00:30 -07:00
Guillaume J. Charmes
9751483112
Add insert command in order to insert external files within an image
2013-05-06 16:00:30 -07:00
Victor Vieux
6f9b574f25
bump to 0.2.2
2013-05-06 11:53:00 +02:00
Guillaume J. Charmes
da01dd3d56
Merge remote-tracking branch 'origin/registry-update'
...
+ Registry: Add the new registry support
2013-05-05 07:13:25 -07:00
shin-
be75608906
Fixed checksum computing. Ensure checksum is computed when image metadata is loaded from disk. Fixed docker push workflow. Moved hash computing to utils
2013-05-06 10:56:10 -07:00
shin-
ea3374bcb0
Prepend hash method to the image checksum
2013-05-06 10:54:55 -07:00
shin-
630d358384
Fixed checksum representation
2013-05-06 10:54:50 -07:00
shin-
048fd671ef
Implemented checksum computation on image creation (necessary for new push primitive)
2013-05-06 10:52:42 -07:00
Victor Vieux
4f0bda2dd5
up to date with master
2013-05-02 18:36:23 +02:00
Guillaume J. Charmes
897cc573f0
Fix the graph.Create prototype
2013-05-02 09:23:29 -07:00
Guillaume J. Charmes
b0459adc27
Comply to the new graph.Create() prototype
2013-05-02 09:14:23 -07:00
Guillaume J. Charmes
3edd14b8c2
Implement the data volume removal
2013-05-02 09:14:23 -07:00
Guillaume J. Charmes
4099a31304
Implement the -volumes-from in order to mount volumes from an other container
2013-05-02 09:14:22 -07:00
Guillaume J. Charmes
6fb495bf6f
Move the id of volumes to Container (instead of Container.Config)
2013-05-02 09:14:22 -07:00
Guillaume J. Charmes
faf8daa7c6
Switch back config to map[string]struct{}
2013-05-02 09:14:22 -07:00
Guillaume J. Charmes
8d9aaee60b
Handle data volumes mount points
2013-05-02 09:14:22 -07:00
Guillaume J. Charmes
35d704c8a0
Change the volumes type to map[string]string to store both source and destination
2013-05-02 09:14:22 -07:00
Solomon Hykes
1df5f4094b
docker run -v PATH: bind a new data volume to a container
2013-05-02 09:14:22 -07:00
Victor Vieux
cf19be44a8
added run (wip), fixed ps and images, added port and tag
2013-04-23 18:20:53 +02:00
Guillaume J. Charmes
f926ed182f
Allow to kill/stop ghosts
2013-04-22 17:53:32 -07:00
Guillaume J. Charmes
d440782e17
Allow to kill container after docker server restarts
2013-04-22 17:52:38 -07:00
Guillaume J. Charmes
82848d4158
Allow to wait on container even after docker server restarts using lxc-info
2013-04-22 17:52:38 -07:00
Evan Wies
ffe16e3224
Fix typo (ghot -> ghost)
2013-04-22 18:37:06 -04:00
Solomon Hykes
76b40ad6c9
Merge remote-tracking branch 'origin/check_kernel_capabilities'
2013-04-20 17:40:25 -07:00
Solomon Hykes
931ca464a7
'docker ps' shows port mappings
2013-04-19 19:29:13 -07:00
Guillaume J. Charmes
e92c4b1f39
Merge pull request #415 from dotcloud/261-choose_grace_period-feature
...
added -t in docker stop and restart to choose grace period
2013-04-19 12:42:34 -07:00
Victor Vieux
b295239de2
added: info, history, logs, ps, start, stop, restart, rm, rmi
2013-04-19 15:24:37 +02:00
Guillaume J. Charmes
f68d107a13
Remove the NO_MEMORY_LIMIT constant
2013-04-18 21:08:20 -07:00
Guillaume J. Charmes
640efc2ed2
Add capabilities check to allow docker to run on kernel that does not have all options
2013-04-18 20:55:41 -07:00
Victor Vieux
1615bb08c7
added -t in docker stop and restart to choose grace period
2013-04-17 11:56:30 +02:00
Guillaume J. Charmes
7b0e96f1f4
Manually pass the env to docker-init instead of relying on lxc to pass it
2013-04-16 14:32:50 -07:00
Solomon Hykes
fdf3308260
Merge remote-tracking branch 'origin/396-disabling_memory_limit-feature'
2013-04-13 21:25:53 -07:00
Solomon Hykes
cdf90bb04b
Merge remote-tracking branch 'origin/96-dns_issue-fix'
2013-04-12 17:50:59 -07:00
Guillaume J. Charmes
1967c8342a
Allow to disable memory limit at compilation time
2013-04-12 10:48:20 -07:00
Guillaume J. Charmes
7673afc843
Allow use to set his own dns via -dns
2013-04-12 10:43:13 -07:00
Solomon Hykes
b1fbebb4a3
Fixed wording of ghost-related messages
2013-04-12 10:39:08 -07:00
Solomon Hykes
3527291b47
Merge remote-tracking branch 'origin/ghost_handling-fix'
2013-04-12 10:33:36 -07:00
Guillaume J. Charmes
bb22cd492e
Add unit test for hanging kill + fix other tests behaviour
2013-04-11 16:21:19 -07:00
Guillaume J. Charmes
313d13ea01
Detect and mark ghost container.
2013-04-11 09:26:17 -07:00
Guillaume J. Charmes
e68c04b722
force kill now use lxc-kill. Fixes #383
2013-04-11 09:04:04 -07:00
Guillaume J. Charmes
1f9f5eed5d
Put the resolv.conf path in a variable instead of being hardcoded within lxc
2013-04-10 18:23:34 -07:00
Solomon Hykes
1b7115a337
Merge remote-tracking branch 'origin/disable_signals-create_escape_sequence'
2013-04-09 12:56:32 -07:00
Guillaume J. Charmes
faa8843650
Look for the escape sequence only in tty mode
2013-04-09 12:55:17 -07:00
Guillaume J. Charmes
0d9e54367f
Fix deadlock on stop failure
2013-04-09 12:06:01 -07:00
Guillaume J. Charmes
1f70b1e15d
Implement an escape sequence in order to be able to detach from a container
2013-04-09 11:06:17 -07:00
Solomon Hykes
1716fccbcc
Merge remote-tracking branch 'origin/change_run_detach_behavious_tty_mode'
2013-04-09 10:39:13 -07:00
Guillaume J. Charmes
7c2b085d1a
Add inconditionnal lock in Start/Stop/Kill to avoid races
2013-04-09 09:09:54 -07:00
Guillaume J. Charmes
64c1b6d9cd
Change the behaviour of CmdRun in tty mode: dont kill the process uppon detach
2013-04-09 08:18:16 -07:00
Guillaume J. Charmes
329f4449dc
Remove the mutexes and use chan instead in order to handle the wait lock
2013-04-09 07:57:59 -07:00
Guillaume J. Charmes
99b5bec069
Fix run disconnect behavious in tty mode + add unit test to enforce it
2013-04-05 19:02:35 -07:00
Guillaume J. Charmes
7d8895545e
Cleanup pty variable names
2013-04-05 17:40:55 -07:00
Guillaume J. Charmes
33a5fe3bd4
Make sure the process start in his own session and grabs the terminal
2013-04-05 17:40:55 -07:00
Guillaume J. Charmes
847a8f45a4
Merge the 3 ptys in 1
2013-04-05 17:40:55 -07:00
Solomon Hykes
793c1ad990
Merge remote-tracking branch 'origin/219-default-bridge-2'
2013-04-05 14:02:16 -07:00
Solomon Hykes
2aad4a3478
Choose which TCP frontend port to allocate with '-p :PORT'
2013-04-04 22:58:01 -07:00
Solomon Hykes
3de51b7bfe
Merge branch 'master' of ssh://github.com/dotcloud/docker
2013-04-04 17:00:59 -07:00
Solomon Hykes
a58cd8c616
Merge pull request #322 from sa2ajj/port-map-nitpick
...
change option description to reflect the semantics
2013-04-04 16:39:54 -07:00
Solomon Hykes
586a79cca0
Merge remote-tracking branch 'dominikh/minor-code-touchups'
2013-04-04 16:20:37 -07:00