Commit Graph

97 Commits

Author SHA1 Message Date
f211a9a21d Refactor Opts
Upstream-commit: 1ba11384bf82f824b0efbab31aaca439cfba1b4f
Component: engine
2013-11-26 17:46:06 +00:00
627f045fff Merge branch 'master' into 0.6.5-dm-plugin
Upstream-commit: e69bbd239ee8dc4bdc0963810448d9f34e4c30c4
Component: engine
2013-11-22 14:06:59 -08:00
4a4a051d8a Use a constant for PortSpecTemplate + display the template in the CmdRun help
Upstream-commit: 1f9223a7c2c0e5c04936c56a071830f8792c3dd7
Component: engine
2013-11-22 12:00:34 -08:00
c04337f42e Reformatting parseRun and partParse
Upstream-commit: 476559458d49b6d4eacfdbe9025ddf69947ae2b7
Component: engine
2013-11-22 11:58:02 -08:00
7686e1f389 Merge branch 'master' into shykes-0.6.5-dm-plugin
Conflicts:
	utils.go
	utils_test.go
Upstream-commit: 7cf60da38880534d76d031c4646fbd469d922385
Component: engine
2013-11-14 14:02:44 -08:00
bf15883f56 Merge pull request #2445 from alexlarsson/fix-shared-root-from-dm
Fix lxc start for shared root filesystems 
Upstream-commit: 629c6e36492336f01fd4e25426a5c875f52628e2
Component: engine
2013-11-14 11:20:53 -08:00
7362e77db4 Move Change to the archive package
Upstream-commit: 01990b65a3cf3da5e04aa6612a17ead2a6cac2c9
Component: engine
2013-11-07 16:46:47 -08:00
914824bce7 Move Change to the archive package, and fix a leftover merge in
Container.Inject()
Upstream-commit: 9ae4bcaaf8aa01da340341e47f99f83a59ce91dc
Component: engine
2013-11-08 00:45:07 +00:00
783f801512 gofmt
Upstream-commit: f1127b9308fbb4d4e21c3c5567ace9fdda82559d
Component: engine
2013-11-07 23:58:03 +00:00
c471d2b756 Merge branch 'master' into 0.6.5-dm-plugin
Conflicts:
	container.go
	runtime.go
Upstream-commit: 165d1bdbc0c4236df9afe85d9cd8b1e65d625865
Component: engine
2013-11-07 23:26:52 +00:00
ce1bb0ce73 fix mergeConfig with new ports
Upstream-commit: 49c4231f077cb0b4804768231396c596d070a22f
Component: engine
2013-11-07 14:31:25 -08:00
5edb271922 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 rshared.

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...
Upstream-commit: 157d99a72786c454dfaad8b0800914cc80879aa8
Component: engine
2013-11-06 20:43:06 +01:00
c2b31012f8 Partial merge of devmapper/ in order to integrate it as a backend
plugin.

The merge is inert, in other words the devmapper code is not called
and the primary aufs backend is untouched.
Upstream-commit: 36c7a7ae943220ffb1bea9cd47d2f586db00eab2
Component: engine
2013-11-01 04:24:17 +00:00
a8e4096f40 check port is valid
Upstream-commit: 7f07ae9e42061f06886441994977a238013dd5ff
Component: engine
2013-10-31 19:00:14 -07:00
4eb97d1f45 Assign id as name when all else fails
Upstream-commit: 8227ea35cfc6a8e7e3da7baed5bfa8a62e304df5
Component: engine
2013-10-30 18:31:18 -07:00
15ee14c05a Hotfix: Migrate public mappings after upgrade
Upstream-commit: 746ba127bfb3556d378ccd8b2c725b490d090334
Component: engine
2013-10-30 08:15:12 -07:00
7ce1e20657 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.
Upstream-commit: 0d2924408bad7aa797bfaf0610e836d82928296f
Component: engine
2013-10-28 18:09:08 -07:00
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
952ac8a789 Add links for container relationships and introspection
Upstream-commit: 1cbdaebaa1c2326e57945333420d25d6f77011d5
Component: engine
2013-10-25 15:13:24 -07:00
f83e69dc32 Merge branch 'master' into dm
Conflicts:
	Dockerfile
	buildfile.go
	container.go
	hack/make/test
	runtime_test.go
	utils/utils.go
Upstream-commit: e9ee860c91b6e9cdcafc03cff9941affb6341a0d
Component: engine
2013-10-18 12:38:29 -07:00
c5e3b824b5 add missing error check
Upstream-commit: f84dc1e90858924f9fafe89e81005842a6b4f166
Component: engine
2013-10-03 22:33:00 +00:00
54672e1985 RootIsShared: Fix root detection
Column 4 is the mount position, column 3 will not always be
"/" for the root. On one of my system its "/root".
Upstream-commit: d263aa6ca916ba9141f341447a2387e7a6316717
Component: engine
2013-09-26 15:09:33 +00:00
65124d19b3 Add CopyFile that can use btrfs reflinks if availible
Upstream-commit: cda87540135a85bd8d45d4eb4853d6962114ec55
Component: engine
2013-09-26 15:09:32 +00:00
07b0e1a559 RootIsShared() - Fix array out of bounds error
This happened for me on the last (empty) line, but better safe than sorry
so we make the check general.
Upstream-commit: d478a4bb5401d7d657a2a100f98ee892a96fef2a
Component: engine
2013-09-26 15:09:32 +00:00
40ab3d4138 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...
Upstream-commit: e40f5c7cb90fbc719241ace45b05c2c61aced658
Component: engine
2013-09-26 15:09:32 +00:00
721615e4c7 abord build if mergeConfig returns an error and fix duplicate error message
Upstream-commit: 5bd0437eedf8036b9648dd095b22d0772fa47e4d
Component: engine
2013-09-20 12:46:24 +00:00
dfb6c3c80f Add lxc-conf flag to allow custom lxc options
Upstream-commit: 551092f9c0da2244c60b75d893ef847f915ca604
Component: engine
2013-08-22 16:05:21 +00:00
0c286d916a Add workdir support for the Buildfile
For consistency the Buildfile should have the option to
set the working directory.

Of course that is one option more to the buildfile,
so please tell me if we really want this to happen.
Upstream-commit: 319988336ceed4428de0e1e55685f8a0ed48a7bd
Component: engine
2013-08-18 20:30:19 +02:00
0d08c8550d rebase master
Upstream-commit: 066873ebd25728fe702fc4b13ed12b5c8be15b97
Component: engine
2013-07-24 14:38:40 +00:00
a6f1fb98b1 fix overwrites EXPOSE
Upstream-commit: a0eec14c7da5b213302c2675801aaf788e84efed
Component: engine
2013-07-19 02:47:35 +00:00
13dc02d1d8 add VolumesFrom to MergeConfig, and test
Upstream-commit: 1a226f0e28e7da4eb3701b31dbe959142c42b752
Component: engine
2013-07-17 21:06:46 +00:00
ef71cbddf6 add Volumes and VolumesFrom to CompareConfig
Upstream-commit: 7c00201222e29989214b7e8a221b057daba0a27d
Component: engine
2013-07-17 20:51:25 +00:00
c3b2bff375 improve mergeconfig, if dns, portspec, env or volumes specify in docker run, apend and not replace
Upstream-commit: 193a7e1dc1945bc9988b6205c63db9d2e0578c55
Component: engine
2013-07-15 13:12:33 +00:00
725d76d0d9 Hotfix: check the length of entrypoint before comparing.
Upstream-commit: 71d2ff494694d7f18310c7994daa34dce33af98b
Component: engine
2013-07-11 17:31:07 -07:00
7935041f18 Add VOLUME instruction to buildfile
Upstream-commit: eb9fef2c424178277cacd29d404cc8e774bb3891
Component: engine
2013-07-10 06:59:16 -09:00
ce8c962683 Merge pull request #1053 from dynport/do-not-copy-hostname-from-image
do not merge hostname from image
Upstream-commit: 16c8a10ef969fd9c87a96df69807b2928cd669de
Component: engine
2013-07-03 10:34:15 -07:00
2e70c0f0f0 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.
Upstream-commit: b16ff9f8598d30823f687d100d351cad11823e77
Component: engine
2013-07-01 05:34:27 -09:00
865986c53d do not merge hostname from image
Upstream-commit: 9bfec5a5389207cba4cdbdd7eafc692c65278ce0
Component: engine
2013-06-28 15:22:01 +02:00
ba9a93959a utils.go: Fix merge logic for user and hostname.
Fall back to image-specified hostname if user doesn't
provide one, instead of only using image-specified
hostname if the user *does* try to set one.
(ditto for username)

Closes #694.
Upstream-commit: 83bc5b7435565d227a7745f4832bc9ce6be7a80d
Component: engine
2013-05-23 15:54:51 -05:00
ce120b932a Move docker build to client
Upstream-commit: 0f312113d3ce37d57fb28eb98c8abcdcbfcd39a3
Component: engine
2013-05-19 10:46:24 -07:00
c376c6e645 Move getKernelVersion to utils package
Upstream-commit: f3bab52df4c6b54218ed36ac354ffc3573d31f3b
Component: engine
2013-05-15 17:40:47 -07:00
bc6fad489c Create a subpackage for utils
Upstream-commit: 2e69e1727b4d5698a90c24c5800eecd5401dc319
Component: engine
2013-05-14 22:37:35 +00:00
3980cc1280 Merge branch 'master' of github.com:dotcloud/docker into 471-cpu-limit
Upstream-commit: 6f3e868a7b8f239334d06b2385b776ce7ae5614f
Component: engine
2013-05-10 14:44:50 -07:00
8ba22c1167 Merge branch 'master' into remote-api
Upstream-commit: 32cbd72ebeedfd6be71cf840f8b56a19e2c0e64c
Component: engine
2013-05-07 21:02:32 +02:00
443030ccf1 implement "-c" option to allocate a number of CPU shares to a container
Upstream-commit: efd9becb78c82ddef07efb7e76e0100d7a712281
Component: engine
2013-05-07 11:16:30 -07:00
e188ef45f3 kernel version - don't show the dash if flavor is empty
Upstream-commit: d2eb2455a1fc379dbac94d651b0785b631b84add
Component: engine
2013-05-07 20:57:21 +03:00
44910e43b1 update to master
Upstream-commit: 10c0e990371e065d4fc1c9b680f03a46e5bacc5e
Component: engine
2013-05-07 19:23:50 +02:00
4d3a8d7c57 Implemented command
Upstream-commit: d56c5406acb3f48ee338a8e4007be7c135074779
Component: engine
2013-05-07 03:49:08 -07:00
7230640e35 Implement caching for docker builder
Upstream-commit: a46fc3a59e585e005ec67b05211ca9de02f0c4ff
Component: engine
2013-05-06 16:44:37 -07:00
f04a7eaf7c Make Builder.Build return the builded image
Upstream-commit: dade95844feaa2446e472767e1e2763996241dee
Component: engine
2013-05-06 16:00:30 -07:00