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

96 Коммитов

Автор SHA1 Сообщение Дата
Michael Crosby e69bbd239e Merge branch 'master' into 0.6.5-dm-plugin 2013-11-22 14:06:59 -08:00
Guillaume J. Charmes 1f9223a7c2
Use a constant for PortSpecTemplate + display the template in the CmdRun help 2013-11-22 12:00:34 -08:00
Guillaume J. Charmes 476559458d Reformatting parseRun and partParse 2013-11-22 11:58:02 -08:00
Guillaume J. Charmes 7cf60da388
Merge branch 'master' into shykes-0.6.5-dm-plugin 
Conflicts:
	utils.go
	utils_test.go
 2013-11-14 14:02:44 -08:00
Michael Crosby 629c6e3649 Merge pull request #2445 from alexlarsson/fix-shared-root-from-dm 
Fix lxc start for shared root filesystems
 2013-11-14 11:20:53 -08:00
Solomon Hykes 01990b65a3 Move Change to the archive package 2013-11-07 16:46:47 -08:00
Solomon Hykes 9ae4bcaaf8 Move Change to the archive package, and fix a leftover merge in 
Container.Inject()
 2013-11-08 00:45:07 +00:00
Solomon Hykes f1127b9308 gofmt 2013-11-07 23:58:03 +00:00
Solomon Hykes 165d1bdbc0 Merge branch 'master' into 0.6.5-dm-plugin 
Conflicts:
	container.go
	runtime.go
 2013-11-07 23:26:52 +00:00
Victor Vieux 49c4231f07 fix mergeConfig with new ports 2013-11-07 14:31:25 -08:00
Alexander Larsson 157d99a727 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...
 2013-11-06 20:43:06 +01:00
Solomon Hykes 36c7a7ae94 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.
 2013-11-01 04:24:17 +00:00
Victor Vieux 7f07ae9e42 check port is valid 2013-10-31 19:00:14 -07:00
Michael Crosby 8227ea35cf Assign id as name when all else fails 2013-10-30 18:31:18 -07:00
Michael Crosby 746ba127bf Hotfix: Migrate public mappings after upgrade 2013-10-30 08:15:12 -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
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
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
Victor Vieux f84dc1e908 add missing error check 2013-10-03 22:33:00 +00:00
Alexander Larsson d263aa6ca9 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".
 2013-09-26 15:09:33 +00:00
Alexander Larsson cda8754013 Add CopyFile that can use btrfs reflinks if availible 2013-09-26 15:09:32 +00:00
Alexander Larsson d478a4bb54 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.
 2013-09-26 15:09:32 +00:00
Alexander Larsson e40f5c7cb9 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-26 15:09:32 +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