Commit Graph

82 Commits

Author SHA1 Message Date
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
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
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
c5e3b824b5 add missing error check
Upstream-commit: f84dc1e90858924f9fafe89e81005842a6b4f166
Component: engine
2013-10-03 22:33:00 +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
d118fe22f7 removed rcli completly
Upstream-commit: 5a2a5ccdaf70fba20c89912153fec19eba35e7e6
Component: engine
2013-05-06 16:59:33 +02:00
dd754d5d4b added login and push
Upstream-commit: f37399d22baaec0b04de42e4712d50f3edd80444
Component: engine
2013-05-06 13:34:31 +02:00
b659f35e7b bump to 0.2.2
Upstream-commit: 6f9b574f25e8fca5e4a28a35b71e4755a424bed8
Component: engine
2013-05-06 11:53:00 +02:00
f515a96fa4 Merge remote-tracking branch 'origin/registry-update'
+ Registry: Add the new registry support
Upstream-commit: da01dd3d56a86f9a1256d3f80c0a4cac5d14bedb
Component: engine
2013-05-05 07:13:25 -07:00
b90c56ad14 gofmt pass
Upstream-commit: d985050aeb3f1411b94b21f6db35a24f9a1f93f2
Component: engine
2013-05-06 10:57:36 -07:00
915420b8dd Fixed checksum computing. Ensure checksum is computed when image metadata is loaded from disk. Fixed docker push workflow. Moved hash computing to utils
Upstream-commit: be7560890644759c0ddd229afed208c537f075d7
Component: engine
2013-05-06 10:56:10 -07:00
8f0ba8b1bd Check that the line is valid with 6 parts after split
Upstream-commit: 589d7c68dbfe0cf4a84b96b799871bfbff4a5970
Component: engine
2013-05-03 13:49:10 -05:00
9af19a7a8b strings.Split may return an empty string on no match
* This fixes an index out of range crash if cgroup memory is not
  enabled.
Upstream-commit: 4bc8ef42d4f294bf6fec6d728ef27abbb638b98d
Component: engine
2013-05-02 14:44:41 -05:00
2c79fdbc57 up to date with master
Upstream-commit: 4f0bda2dd5cfe382f7fd9cfb9f5522f42377673b
Component: engine
2013-05-02 18:36:23 +02:00
500a2c5aa9 Use /proc/mounts instead of mount(8)
Specifically, Ubuntu Precise's cgroup-lite script uses mount -n
to mount the cgroup filesystems so they don't appear in mtab, so
detection always fails unless the admin updates mtab with /proc/mounts.

/proc/mounts is valid on just about every Linux machine in existence and
as a bonus is much easier to parse.

I also removed the regex in favor of a more accurate parser that should
also support monolitic cgroup mounts (e.g. mount -t cgroup none /cgroup).
Upstream-commit: c6119da33925fccf6af3f232f7aa7c75de41493b
Component: engine
2013-04-30 17:37:43 +00:00
a28a51bb37 working tty
Upstream-commit: e5104a4cb4fe68ecd17b5a01ce295c64f8107b42
Component: engine
2013-04-29 15:12:18 +02:00
f318096044 Update FindCgroupMountpoint to be more forgiving
On Gentoo, the memory cgroup is mounted at /sys/fs/cgroup/memory, but the mount line looks like the following:
memory on /sys/fs/cgroup/memory type cgroup (rw,nosuid,nodev,noexec,relatime,memory)

(note that the first word on the line is "memory", not "cgroup", but the other essentials are there, namely the type of cgroup and the memory mount option)
Upstream-commit: e413340723871ad2d7a03822ca06993ee3c0a4bc
Component: engine
2013-04-23 01:09:29 -06:00
6b46021e64 Move the kernel detection to arch specific files
Upstream-commit: 16aeb77d5155cf33d1637073b9ca56728d472b49
Component: engine
2013-04-22 12:08:59 -07:00
59824ca670 Make the kernel version detection more generic
Upstream-commit: 4ac3b803b9b7d0db1840a12f3332034938eb9550
Component: engine
2013-04-22 11:39:56 -07:00
7f4ff6f610 Merge pull request #454 from tianon/master
Update utils.go to not enforce extra constraints on the kernel "flavor" (such as being integral or even comparable one to another)
Upstream-commit: 2ced94b41461a399bc848006901af5ab15d665c3
Component: engine
2013-04-22 08:02:42 -07:00