microsoft
/
docker
зеркало из https://github.com/microsoft/docker.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
3 714 коммитов 243 Ветки 83 Теги 223 MiB
Граф коммитов

75 Коммитов

Автор SHA1 Сообщение Дата
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
Victor Vieux f84dc1e908 add missing error check 2013-10-03 22:33:00 +00:00
Victor Vieux 5bd0437eed abord build if mergeConfig returns an error and fix duplicate error message 2013-09-20 12:46:24 +00:00
Michael Crosby 551092f9c0 Add lxc-conf flag to allow custom lxc options 2013-08-22 16:05:21 +00:00
Marco Hennings 319988336c 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.
 2013-08-18 20:30:19 +02:00
Victor Vieux 066873ebd2 rebase master 2013-07-24 14:38:40 +00:00
Victor Vieux a0eec14c7d fix overwrites EXPOSE 2013-07-19 02:47:35 +00:00
Victor Vieux 1a226f0e28 add VolumesFrom to MergeConfig, and test 2013-07-17 21:06:46 +00:00
Victor Vieux 7c00201222 add Volumes and VolumesFrom to CompareConfig 2013-07-17 20:51:25 +00:00
Victor Vieux 193a7e1dc1 improve mergeconfig, if dns, portspec, env or volumes specify in docker run, apend and not replace 2013-07-15 13:12:33 +00:00
Guillaume J. Charmes 71d2ff4946 Hotfix: check the length of entrypoint before comparing. 2013-07-11 17:31:07 -07:00
Michael Crosby eb9fef2c42 Add VOLUME instruction to buildfile 2013-07-10 06:59:16 -09:00
Guillaume J. Charmes 16c8a10ef9 Merge pull request #1053 from dynport/do-not-copy-hostname-from-image 
do not merge hostname from image
 2013-07-03 10:34:15 -07: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
Tobias Schwab 9bfec5a538 do not merge hostname from image 2013-06-28 15:22:01 +02:00
Will Dietz 83bc5b7435 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.
 2013-05-23 15:54:51 -05:00
Guillaume J. Charmes 0f312113d3 Move docker build to client 2013-05-19 10:46:24 -07:00
Guillaume J. Charmes f3bab52df4 Move getKernelVersion to utils package 2013-05-15 17:40:47 -07:00
Guillaume J. Charmes 2e69e1727b Create a subpackage for utils 2013-05-14 22:37:35 +00: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
Victor Vieux 32cbd72ebe Merge branch 'master' into remote-api 2013-05-07 21:02:32 +02: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
unclejack d2eb2455a1 kernel version - don't show the dash if flavor is empty 2013-05-07 20:57:21 +03:00
Victor Vieux 10c0e99037 update to master 2013-05-07 19:23:50 +02:00
shin- d56c5406ac Implemented command 2013-05-07 03:49:08 -07:00
Guillaume J. Charmes a46fc3a59e Implement caching for docker builder 2013-05-06 16:44:37 -07:00
Guillaume J. Charmes dade95844f Make Builder.Build return the builded image 2013-05-06 16:00:30 -07:00
Victor Vieux 5a2a5ccdaf removed rcli completly 2013-05-06 16:59:33 +02:00
Victor Vieux f37399d22b added login and push 2013-05-06 13:34:31 +02: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- d985050aeb gofmt pass 2013-05-06 10:57:36 -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
Harley Laue 589d7c68db Check that the line is valid with 6 parts after split 2013-05-03 13:49:10 -05:00
Harley Laue 4bc8ef42d4 strings.Split may return an empty string on no match 
* This fixes an index out of range crash if cgroup memory is not
  enabled.
 2013-05-02 14:44:41 -05:00
Victor Vieux 4f0bda2dd5 up to date with master 2013-05-02 18:36:23 +02:00
Al Tobey c6119da339 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).
 2013-04-30 17:37:43 +00:00
Victor Vieux e5104a4cb4 working tty 2013-04-29 15:12:18 +02:00
Tianon Gravi e413340723 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)
 2013-04-23 01:09:29 -06:00
Guillaume J. Charmes 16aeb77d51 Move the kernel detection to arch specific files 2013-04-22 12:08:59 -07:00
Guillaume J. Charmes 4ac3b803b9 Make the kernel version detection more generic 2013-04-22 11:39:56 -07:00
Guillaume J. Charmes 2ced94b414 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)
 2013-04-22 08:02:42 -07:00
Guillaume J. Charmes 71b5806614 Do not stop execution if cgroup mountpoint is not found 2013-04-22 00:44:57 -04:00
Tianon Gravi 1f65c6bf4c Update utils.go to not enforce extra constraints on the kernel "flavor" (such as being integral or even comparable one to another) 
This is especially to fix the current docker on kernels such as gentoo-sources, where the "flavor" is the string "gentoo", and that obviously fails to be converted to an integer.
 2013-04-21 19:19:38 -06:00
Solomon Hykes 965e8a02d2 'docker push' shows an additional progress bar while it buffers the archive to disk. Fixes #451. 2013-04-21 15:29:26 -07:00
Guillaume J. Charmes f3e89fae28 Use mount to determine the cgroup mountpoint 2013-04-18 21:57:58 -07:00
Guillaume J. Charmes 003622c8b6 Check kernel version and display warning if too low 2013-04-18 20:47:24 -07:00
Guillaume J. Charmes 626bfd87a7 Use integers instead of non-printable chars in the escape sequence detection 2013-04-09 12:55:26 -07:00
Guillaume J. Charmes 8f41f1fa60 Remove unused optimization that could lead in loosing the escape sequence 2013-04-09 12:55:26 -07:00