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

266 Коммитов

Автор SHA1 Сообщение Дата
Solomon Hykes 2a209afe5f gofmt 2013-11-14 10:50:43 -08:00
Solomon Hykes 359a6f49b9 Move integration tests to integration/, expose missing public methods in the core 2013-11-14 10:50:00 -08:00
Solomon Hykes b00d5f0185 gofmt 2013-11-13 19:25:55 +00:00
Michael Crosby a4f14528c2 Ignore dir sizes in TreeSize func 2013-11-13 10:33:24 -08:00
Solomon Hykes 6c4393ccbb Merge branch 'job-create-start-clean' into engine-patch-2 
Conflicts:
	engine/engine.go
	engine/job.go
	server.go
	utils_test.go
 2013-11-13 00:36:20 +00:00
Liang-Chi Hsieh 879aa29cb0 modify test of GetNameserversAsCIDR for its regex change. 2013-11-12 18:18:30 +08:00
Liang-Chi Hsieh 1e5ba57de3 fix nameserver regex. 2013-11-12 10:53:34 +08:00
Victor Vieux da24945070 Merge branch 'master' of https://github.com/aanand/docker into aanand-master 2013-11-11 12:34:16 -08: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
Solomon Hykes f2bab1557c Simplify graphdriver interface: Create, Get. No more external mounting or Dir/Image interface 2013-11-07 22:38:50 +00:00
Guillaume J. Charmes 6998c3c387
go fmt 2013-11-07 12:27:33 -08:00
Alexander Larsson c5bc7d5158 Utils: Add ShellQuoteArguments 2013-11-06 20:39:09 +01:00
Mark Allen 3560c922b1 Prevent DNS server conflicts in CreateBridgeIface 
Retrieve /etc/resolv.conf data (if available)

Add checkNameserverOverlaps and call it to
make sure there are no conflicts

Add utils.GetNameserversAsCIDR and tests

Read /etc/resolv.conf and pull out nameservers,
formatting them as a CIDR block ("1.2.3.4/32")
 2013-11-05 21:24:37 -06:00
Solomon Hykes 5a85456d48 Hack: simplify the creation of test directories 2013-11-05 23:00:16 +00:00
Michael Crosby 2a0efb2324 Merge pull request #2427 from thequux/send-headers-immediately 
Make /events API send headers immediately
 2013-11-04 08:49:27 -08:00
Dan Hirsch a963ff5d8d Added explicit Flush method to utils.WriteFlusher 2013-11-01 13:11:21 -04:00
Aanand Prasad 9ee9d2f995 Container memory limit can be specified in kilobytes, megabytes or gigabytes 
-m 10  # 10 bytes
    -m 10b # 10 bytes
    -m 10k # 10240 bytes (10 * 1024)
    -m 10m # 10485760 bytes (10 * 1024 * 1024)
    -m 10g # 10737418240 bytes (10 * 1024 * 1024 * 1024)

Units are case-insensitive, and 'kb', 'mb' and 'gb' are equivalent to 'k', 'm' and 'g'.
 2013-11-01 12:00:17 +00: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 e3c49843d7 Merge pull request #2494 from shykes/engine-links 
Engine: Minimal, unintrusive implementation of a cleaner Job API.
 2013-10-31 16:32:49 -07:00
Victor Vieux 700a71e6b6 stop proxy at one point 2013-10-29 14:29:01 -07:00
Solomon Hykes c1ae1a0e1c Setup daemon pidfile/cleanup in Server.Daemon() instead of main() 2013-10-26 14:26:07 -07:00
Solomon Hykes 2a29bf6245 Engine: basic testing harness 2013-10-26 14:18:28 -07:00
Tianon Gravi 21161dbd51 Add dynbinary and dyntest scripts for building/testing a separate static dockerinit binary 
After a nice long brainstorming session with @shykes on IRC, we decided on using a SHA1 hash of dockerinit compiled into the dynamic docker binary to ensure that we always use the two in a perfect pair, and never mix and match.
 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
Yang Bai e81da876df let utils.ParseHost return err when errors happen 2013-10-24 13:23:02 +08:00
Yang Bai 99f1675566 refactor utils.ParseHost with switch-case, so we can add other proto support easily 2013-10-23 18:29:35 +08: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
Jérôme Petazzoni cc851dbb3f Catch errClosing error when TCP and UDP proxies are terminated. 2013-10-16 14:43:20 -07:00
Jérôme Petazzoni e32debcf5f Add better comments to utils/stdcopy.go. 2013-10-16 10:58:53 -07:00
Alexander Larsson 8e4b3a3390 Add some docs for newly exported functions 2013-10-14 10:53:12 +02: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
Guillaume J. Charmes 8b2f4aab23
Random improvments 2013-10-02 20:18:15 -07:00
Alexander Larsson a7e876e357 ShellQuoteArguments: Fix quoting 
This accidentally used two quotes to start/end each quoted string.
 2013-09-30 17:35:01 -06:00
Alexander Larsson 145024c6cc Utils: Add ShellQuoteArguments 2013-09-30 17:35:01 -06:00
Guillaume J. Charmes f435970695 Merge pull request #1842 from dotcloud/split_stdout_stderr 
* Runtime: Split stdout stderr
 2013-09-26 18:05:24 -07:00
Guillaume J. Charmes cb18a6e1b9
Update docs + fix endian issue 2013-09-26 17:36:21 -07:00
Guillaume J. Charmes e854b7b2e6
Make StdCopy works with huge amount of data 2013-09-11 14:49:33 -07:00
Guillaume J. Charmes 8ae5348a51 Split stdout stderr for non-tty commands 2013-09-11 14:48:22 -07:00
Michael Crosby bd0e4fde9a Merge pull request #1838 from jmcvetta/multiline_dockerfile 
Implementation of multiline syntax for Dockerfile
 2013-09-10 14:22:34 -07:00
Jason McVetta 6678a26d1c gofmt 2013-09-09 15:11:30 -07:00
Victor Vieux 46a1cd69a9 only os.Exits on error 2013-09-09 21:26:35 +00:00
Guillaume J. Charmes b07314e2e0
Remove import os/user 2013-09-06 23:00:21 +00:00
shin- b3a70d767d Compute dependency graph and upload layers in the right order when pushing 2013-09-04 02:21:40 +02:00
Michael Crosby 84431ec03c Merge pull request #1613 from thijsterlouw/proper_resolvconf_parsing 
Proper resolv.conf parsing
 2013-08-30 12:10:45 -07:00
daniel-garcia d593f57952 write newline after every log message. 2013-08-27 14:09:26 -05:00
Mohit Soni f4432d50c3 Refactored code and added unit tests 
- Extracted ParseRelease method from GetKernelVersion to make code
  more testable
- Added tests for ParseRelease method
 2013-08-24 00:24:40 -07:00
Mohit Soni ab882da03b Fixes #1643 
Changed the split statement, from SplitN to Split. Doing so takes
care of cases, when a minor version is followed by a suffix, that
starts with '.'.
 2013-08-23 14:37:37 -07:00
shin- 093b85b72f Use additional decorator in RequestFactory to pass meta headers to registry 2013-08-22 21:15:31 +02:00
Thijs Terlouw c349b4d56c Keep linebreaks and generalize code 2013-08-21 15:48:39 +02:00
Thijs Terlouw 62e84785b6 proper resolv.conf parsing 2013-08-21 15:23:12 +02:00
Victor Vieux d7979ef2d0 hot fix display in parallel pull and go fmt 2013-08-15 11:42:40 +00: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
Michael Crosby ec61c46bf7 Add import for dotcloud/tar to replace std tar pkg 2013-08-12 22:42:29 +00:00
Pascal Borreli 9b2a5964fc Fixed typos 2013-08-12 18:53:06 +01:00
Victor Vieux 703905d7ec ensure the use oh IDs and add image's name in /events 2013-08-12 11:50:03 +00:00
Victor Vieux 213365c2d2 fix docker build and docker events output 2013-08-08 22:51:39 +00:00
Victor Vieux ba17f4a06a fix small \n error un docker build 2013-08-06 14:31:51 +00:00
Guillaume J. Charmes dcf9dfb129 Update utils_test.go 2013-08-05 16:32:25 -07:00
Victor Vieux 946bbee39a rebase master 2013-08-05 16:25:42 +00:00
Victor Vieux feda3db1dd Merge pull request #1382 from monnand/650-http-utils 
650 http utils and user agent field
 2013-08-05 08:49:12 -07:00
Victor Vieux 030cc8d5cc Merge pull request #1389 from dotcloud/1373-improve_checklocaldns 
Consider empty /etc/resolv.conf as local dns + add unit test
 2013-08-05 02:29:36 -07:00
Guillaume J. Charmes 4dcc0f316c Merge pull request #1298 from crosbymichael/1246-auth-request 
* Registry: Do not require login unless 401 is received on push
 2013-08-02 17:39:54 -07:00
Michael Crosby dae585c6e4 Return JSONError for HTTPResponse error 2013-08-03 00:27:58 +00:00
Guillaume J. Charmes 3e9575e275
Consider empty /etc/resolv.conf as local dns + add unit test 2013-08-02 15:23:36 -07:00
Guillaume J. Charmes ffcba1236c Merge pull request #1117 from dotcloud/add_last_version-feature 
Add last stable version in `docker version`
 2013-08-02 13:53:33 -07:00
Nan Monnand Deng 6a56b7b391 Server now use request factory 2013-08-02 03:23:46 -04:00
Nan Monnand Deng 793fd983ef http utils 2013-08-02 02:47:58 -04:00
Victor Vieux 0c0077ed6f Merge pull request #1328 from dotcloud/1307_url_port_delete-fix 
Use utils.ParseRepositoryTag instead of strings.Split(name, ":") in server.ImageDelete
 2013-07-31 07:55:06 -07:00
Michael Crosby 3043c26419 Return registy status code in error 
Added Details map to the JSONMessage
 2013-07-30 23:24:31 +00:00
Victor Vieux 6166380d76 rebase master 2013-07-30 16:51:50 +00:00
Victor Vieux e4752c8c1a Add check that the request is good 2013-07-30 16:42:32 +00:00
Victor Vieux 99c27fa0dd Merge branch 'master' into add_last_version-feature 2013-07-30 16:23:06 +00:00
Victor Vieux bcd6ca3685 Merge pull request #1268 from dotcloud/refactor_checksum 
Refactor checksum
 2013-07-30 06:07:54 -07:00
Victor Vieux 46f59dd933 add parallel pull to 1.4 2013-07-30 12:15:33 +00:00
Victor Vieux e1fa989ec9 rebase master 2013-07-30 11:59:31 +00:00
Guillaume J. Charmes 394941b6b0 Switch json/payload order 2013-07-29 11:30:17 -07:00
Guillaume J. Charmes e3f68b22d8 Handle extra-paremeter within checksum calculations 2013-07-29 11:30:17 -07:00
Guillaume J. Charmes 8ca7b0646e Refactor checksum 2013-07-29 11:30:17 -07:00
Victor Vieux 3852d05990 add ParseRepositoryTag tests 2013-07-29 12:16:01 +00:00
Fareed Dudhia d86898b014 Fixes 1136; Reopened from 1175 with latest changes. 2013-07-25 19:45:49 +00:00
Victor Vieux 01e98bf0dd fix errors 2013-07-25 14:32:46 +00:00
Victor Vieux f1dd299227 Use VT100 escape codes 
:
 2013-07-25 14:16:36 +00:00
Victor Vieux 8742649aa7 improve client output 2013-07-24 17:10:59 +00:00
Victor Vieux 0e71e368a8 Add ID to JSONMessage in pull 
Use goroutines to pull in parallel
If multiple images pulled at the same time, each progress is displayed on a new line
 2013-07-24 15:41:34 +00:00
Victor Vieux b8d52ec266 add timestamp and change untagged -> untag 2013-07-23 15:41:19 +00:00
Victor Vieux b5da816487 basic version of the /events endpoint 2013-07-23 15:41:19 +00:00
Victor Vieux 2e3b660dd0 fix error in utils tests 2013-07-19 13:56:36 +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
Victor Vieux 39ff542142 Merge branch 'master' into add_last_version-feature 2013-07-18 20:51:31 +00:00
Guillaume J. Charmes 1004d57b85
Hotfix: make sure ./utils tests pass 2013-07-15 17:58:23 -07:00
Guillaume J. Charmes 454cd147fb Merge pull request #1096 from dotcloud/remove_os_user 
* Runtime: Remove the os.user dependency and manually lookup /etc/passwd instead
 2013-07-15 10:19:09 -07:00
Guillaume J. Charmes e41507bde2 Add unit test to check wrong uid case 2013-07-15 10:05:09 -07: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
Marcus Farkas bac5772312 *Client: Fix the progressbar, without manipulating other outputs 
Prior this commit, 'docker images' and other cmd's, which used utils.HumanSize(),
showed unnecessary whitespaces.
Formatting of progress has been moved to FormatProgess(), justifing the string
directly in the template.
 2013-07-12 20:15:25 +02:00
Marcus Farkas a6e5a397bd Revert "Client: better progressbar output" 
This reverts commit 3ac68f1966.
 2013-07-12 20:08:45 +02:00
Guillaume J. Charmes eb38750d99 Remove the os.user dependency and manually lookup /etc/passwd instead 2013-07-12 10:49:47 -07:00
Victor Vieux e9011122fb use http://get.docker.io/latest 2013-07-12 11:45:40 +00:00
Victor Vieux 941e3e2ef0 wip 2013-07-11 17:18:28 +00:00
Sam Alba 019324015b Moved parseRepositoryTag to the utils package 2013-07-09 08:06:10 -07:00
Caleb Spare 27ee261e60 Simplify the NopWriter code. 2013-07-03 14:35:18 -07:00
Victor Vieux 64450ae3f8 add last version 2013-07-03 17:11:00 +00: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
Sam Alba 893c974b08 Resolve conflict 2013-06-28 12:32:41 -07:00
Victor Vieux a11fc9f067 Merge pull request #1032 from andrewsmedina/govet 
following the 'go vet' suggestions for the docker package.
 2013-06-28 05:27:53 -07:00
unclejack 5ed4386bbf remove + from minor kernel version 2013-06-27 17:51:17 +03:00
Andrews Medina 6cf493bea7 following 'go vet' in utils pkg. 2013-06-27 01:40:13 -03:00
Victor Vieux bccf06c748 update progressbar every MIN(1%, 512kB) 2013-06-25 14:03:15 +00:00
Victor Vieux eca9f9c1a1 fix regrettion in utils tests introduced by #980 2013-06-24 16:12:39 +00:00
Guillaume J. Charmes de1a5a75cc Merge pull request #848 from dotcloud/builder_server-3 
Improve Docker build
 2013-06-21 14:55:08 -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
Marcus Farkas 3ac68f1966 Client: better progressbar output 2013-06-21 17:19:27 +02:00
Solomon Hykes 352991bdf4 Merge branch 'simpler-build-upload' (#900) into builder_server-3 (#848) 2013-06-20 22:02:36 -07:00
Jonathan Rudenberg 50b70eeb68 Remove code unreachable using Go 1.1 2013-06-20 23:19:44 -04:00
Solomon Hykes e43323221b Merge branch 'master' into simpler-build-upload 
Conflicts:
	api.go
	builder_client.go
	commands.go
 2013-06-20 14:19:09 -07:00
Guillaume J. Charmes fa68fe6ff3 Merge pull request #938 from dotcloud/add_unix_socket-feature 
* Runtime: Add unix socket and multiple -H
 2013-06-20 11:17:16 -07:00
Guillaume J. Charmes 659e846006 Merge branch 'master' into builder_server-3 
Conflicts:
	docs/sources/use/builder.rst
 2013-06-20 10:27:12 -07:00
Victor Vieux ec3c89e57c Merge pull request #849 from dotcloud/improve_progressbar_pull 
* Client: HumanReadable ProgressBar sizes in pull
 2013-06-19 08:02:40 -07:00
Victor Vieux 9632bf2287 add tests 2013-06-19 12:40:01 +00:00
Victor Vieux dede1585ee add the possibility to use multiple -H 2013-06-19 12:31:54 +00:00
Victor Vieux 3adf9ce04e add basic support for unix sockets 2013-06-18 18:59:56 +00:00
Guillaume J. Charmes 555552340d Merge branch 'master' into builder_server-3 
Conflicts:
	buildfile_test.go
 2013-06-17 14:01:32 -07:00
Guillaume J. Charmes 78f86ea502 Merge branch 'master' into builder_server-3 
Conflicts:
	utils/utils.go
 2013-06-14 17:08:39 -07:00
Solomon Hykes 5b8287617d + Builder: ADD of a local file will detect tar archives and unpack them 
into the container instead of copying them as a regular file.

* Builder: ADD uses tar/untar for copies instead of calling 'cp -ar'.
	This is more consistent, reduces the number of dependencies, and
	fixe #896.
 2013-06-14 16:43:39 -07:00
Guillaume J. Charmes 76a568fc97 Fix merge issue 2013-06-14 16:08:08 -07:00
Solomon Hykes 250e47e2eb Merge branch 'dns_server_side' 
+ Configure dns configuration host-wide with 'docker -d -dns'
+ Detect faulty DNS configuration and replace it with a public default
 2013-06-14 14:39:05 -07:00
Guillaume J. Charmes 60fd7d686d Merge branch 'master' into improve_progressbar_pull 2013-06-14 12:01:40 -07:00
Guillaume J. Charmes 1e0738f63f Make the progressbar human readable 2013-06-06 18:42:52 -07:00
Guillaume J. Charmes a11e61677c Move the docker build URL form client to server, prepare for GIT support 2013-06-06 16:09:46 -07:00
Guillaume J. Charmes f4a4cfd2cc Move isUrl to utils.IsURL 2013-06-06 15:50:09 -07:00
Guillaume J. Charmes a3f6054f97 Check for local dns server and output a warning 2013-06-06 11:01:09 -07:00
Guillaume J. Charmes 84d68007cb Add -dns to docker daemon 2013-06-05 14:20:54 -07:00
Victor Vieux bf63cb9045 bump to master again 2013-06-05 16:01:36 +00:00
Victor Vieux b4682e6707 bump to master 2013-06-05 10:19:51 +00:00
Victor Vieux fd224ee590 linted names 2013-06-04 18:00:22 +00:00
Victor Vieux 3922691fb9 fix progress message in client 2013-06-04 16:09:08 +00:00
Victor Vieux 86ada2fa5d drop/omit 2013-06-04 13:51:12 +00:00
Victor Vieux 3afdd82e42 bump to master 2013-05-30 23:38:40 +00:00
Victor Vieux cd002a4d16 ensure progress downloader is well formated 2013-05-30 17:00:42 +00:00
Victor Vieux f339fc2eb9 bump to master 2013-05-29 13:52:18 +00:00
Guillaume J. Charmes 2897cb0476 Add directory contents instead of while directory for docker build 2013-05-28 15:22:01 -07:00
Guillaume J. Charmes dce82bc856 Merge master 2013-05-28 13:42:50 -07:00
Guillaume J. Charmes 6ae3800151 Implement the CmdAdd instruction 2013-05-28 13:38:26 -07:00
Victor Vieux 5a36efb61f fix json encoding, and use less casts 2013-05-26 23:45:45 +00:00
Victor Vieux 14212930e4 ensure valid json 2013-05-25 15:51:26 +00:00
Victor Vieux c8c7094b2e imporved error, push, import insert 2013-05-25 15:09:46 +00:00
Victor Vieux cb0bc4adc2 add error handling 2013-05-25 14:12:02 +00:00