b91918adb1
Merge pull request #2694 from shykes/separate-integration-tests
...
Separate integration tests
Upstream-commit: 51576069ad7470d308402536306c35f47cf89edb
Component: engine
2013-11-15 18:21:34 -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
13d08cbd03
gofmt
...
Upstream-commit: 2a209afe5fe0f27296e3e06a199bb5305910e1cf
Component: engine
2013-11-14 10:50:43 -08:00
6c1679864e
Move integration tests to integration/, expose missing public methods in the core
...
Upstream-commit: 359a6f49b9ec704686d0cb0df7cb0d7c8d5f55a7
Component: engine
2013-11-14 10:50:00 -08:00
cea9cd6554
gofmt
...
Upstream-commit: b00d5f018541bf141dc4732ad6d71d23b8c28b43
Component: engine
2013-11-13 19:25:55 +00:00
a48718c85a
Merge branch 'job-create-start-clean' into engine-patch-2
...
Conflicts:
engine/engine.go
engine/job.go
server.go
utils_test.go
Upstream-commit: 6c4393ccbbec0fa66f9fc7e326b5a2809615c3a1
Component: engine
2013-11-13 00:36:20 +00:00
5ec9c64577
modify test of GetNameserversAsCIDR for its regex change.
...
Upstream-commit: 879aa29cb09c641bbd510eed03647f8f85f0d559
Component: engine
2013-11-12 18:18:30 +08:00
31cff767cd
fix nameserver regex.
...
Upstream-commit: 1e5ba57de372bd13b0231e969dbb62a7fa8d7b52
Component: engine
2013-11-12 10:53:34 +08:00
fac387b017
Merge branch 'master' of https://github.com/aanand/docker into aanand-master
...
Upstream-commit: da24945070e305e09d4d96d1f981614eaa18b01f
Component: engine
2013-11-11 12:34:16 -08:00
6d24142423
go fmt
...
Upstream-commit: 6998c3c387518ba8e06ceff00b10be583c95d6cd
Component: engine
2013-11-07 12:27:33 -08:00
58f4b4c19f
Utils: Add ShellQuoteArguments
...
Upstream-commit: c5bc7d515836cffee90ba5bb342272bba64d9f37
Component: engine
2013-11-06 20:39:09 +01:00
a507d209c4
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")
Upstream-commit: 3560c922b193e0f6b06c715a7b920f90a5990859
Component: engine
2013-11-05 21:24:37 -06:00
c136168290
Hack: simplify the creation of test directories
...
Upstream-commit: 5a85456d481a5f88fc0efc02c41b3bff987c0ed1
Component: engine
2013-11-05 23:00:16 +00:00
062afa9bce
Merge pull request #2427 from thequux/send-headers-immediately
...
Make /events API send headers immediately
Upstream-commit: 2a0efb23243f2e72e61efa51ceaafa58353cf21b
Component: engine
2013-11-04 08:49:27 -08:00
ee347d7b68
Added explicit Flush method to utils.WriteFlusher
...
Upstream-commit: a963ff5d8df4e6d0e42dd669d3d60aafb8f880a7
Component: engine
2013-11-01 13:11:21 -04:00
a1a49c8919
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'.
Upstream-commit: 9ee9d2f9959390d1cda56accbbd975df18d157ad
Component: engine
2013-11-01 12:00:17 +00:00
04226c60be
Merge pull request #2494 from shykes/engine-links
...
Engine: Minimal, unintrusive implementation of a cleaner Job API.
Upstream-commit: e3c49843d70ea2856592a7af5e5d83e655898a70
Component: engine
2013-10-31 16:32:49 -07:00
a59c312632
stop proxy at one point
...
Upstream-commit: 700a71e6b62a3786d11719ae30cacd0f90930525
Component: engine
2013-10-29 14:29:01 -07:00
ae44c03557
Setup daemon pidfile/cleanup in Server.Daemon() instead of main()
...
Upstream-commit: c1ae1a0e1cfae1aed681add5b1cb1c39e2c0e929
Component: engine
2013-10-26 14:26:07 -07:00
e490910840
Engine: basic testing harness
...
Upstream-commit: 2a29bf624536c9daed25966dcaf80d840d0972c3
Component: engine
2013-10-26 14:18:28 -07:00
7f47a302d5
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.
Upstream-commit: 21161dbd515fb97cf9052a5980de6fc6180a89dc
Component: engine
2013-10-25 15:13:25 -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
3f6f7d77a8
let utils.ParseHost return err when errors happen
...
Upstream-commit: e81da876df57fb8e0562cc64e7b57dc7eb32284a
Component: engine
2013-10-24 13:23:02 +08:00
4cbb2084bc
refactor utils.ParseHost with switch-case, so we can add other proto support easily
...
Upstream-commit: 99f16755661de79cac1ccda78e3e96552f6a4491
Component: engine
2013-10-23 18:29:35 +08:00
02bbabf14d
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
Upstream-commit: 4918769b1ac2d38f23087b766140e6a7f8979310
Component: engine
2013-10-18 16:16:29 -07:00
d7c383fbe1
Catch errClosing error when TCP and UDP proxies are terminated.
...
Upstream-commit: cc851dbb3f4725562729f12663e246690a61c620
Component: engine
2013-10-16 14:43:20 -07:00
261563ed6c
Add better comments to utils/stdcopy.go.
...
Upstream-commit: e32debcf5fb6bf056a871930a8a88d545653e96f
Component: engine
2013-10-16 10:58:53 -07:00
b2ba4dc1a1
Initial steps to fix Issue #936
...
Use utils.Errorf instead of utils.Debugf
Upstream-commit: ad723bbfe7cda7839b3c7f82e63699bf2b9c4911
Component: engine
2013-10-11 08:04:40 -05:00
f9de2ea5c3
Merge pull request #1842 from dotcloud/split_stdout_stderr
...
* Runtime: Split stdout stderr
Upstream-commit: f435970695e896ae8532cd0850700ae56d0b0516
Component: engine
2013-09-26 18:05:24 -07:00
c6a1c7cdae
Update docs + fix endian issue
...
Upstream-commit: cb18a6e1b934b7f5c63f8931ee8fe51e2789c597
Component: engine
2013-09-26 17:36:21 -07:00
eac5eb816d
Make StdCopy works with huge amount of data
...
Upstream-commit: e854b7b2e6666d8b47f2c9714ac3bef2320fc40b
Component: engine
2013-09-11 14:49:33 -07:00
66b0c6b946
Split stdout stderr for non-tty commands
...
Upstream-commit: 8ae5348a51ab6026db29009f109bb3724908f0aa
Component: engine
2013-09-11 14:48:22 -07:00
97c0d31d6a
Merge pull request #1838 from jmcvetta/multiline_dockerfile
...
Implementation of multiline syntax for Dockerfile
Upstream-commit: bd0e4fde9a2a1fb1f676e7ea19e111be46cb87c8
Component: engine
2013-09-10 14:22:34 -07:00
cebebc8343
gofmt
...
Upstream-commit: 6678a26d1c94e7838c055a3da3b91ae3de8c3e3c
Component: engine
2013-09-09 15:11:30 -07:00
fb9071f221
only os.Exits on error
...
Upstream-commit: 46a1cd69a99a9adc7bc366f1eb2c03b62f464d39
Component: engine
2013-09-09 21:26:35 +00:00
eed5427302
Remove import os/user
...
Upstream-commit: b07314e2e066a1308040e1eb45a96a0e1056f28a
Component: engine
2013-09-06 23:00:21 +00:00
32d6ba57cb
Compute dependency graph and upload layers in the right order when pushing
...
Upstream-commit: b3a70d767d913ec476bc1af53983c91a10d17f84
Component: engine
2013-09-04 02:21:40 +02:00
8468ddcf8f
Merge pull request #1613 from thijsterlouw/proper_resolvconf_parsing
...
Proper resolv.conf parsing
Upstream-commit: 84431ec03c08f0d8ce8f9385aa1b709a28fef1f3
Component: engine
2013-08-30 12:10:45 -07:00
53272d3dc7
write newline after every log message.
...
Upstream-commit: d593f579528d2555296b535aeae8383f5d2ee9b3
Component: engine
2013-08-27 14:09:26 -05:00
b48c0523d0
Refactored code and added unit tests
...
- Extracted ParseRelease method from GetKernelVersion to make code
more testable
- Added tests for ParseRelease method
Upstream-commit: f4432d50c388c242bba6b697f31b32f1fe21ff65
Component: engine
2013-08-24 00:24:40 -07:00
c0c4da0db6
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 '.'.
Upstream-commit: ab882da03b57037885c4222f474fa8bd37a01956
Component: engine
2013-08-23 14:37:37 -07:00
5443b4f352
Use additional decorator in RequestFactory to pass meta headers to registry
...
Upstream-commit: 093b85b72f7a0fcda292816716e795543b3a72eb
Component: engine
2013-08-22 21:15:31 +02:00
6fad2c6e0b
Keep linebreaks and generalize code
...
Upstream-commit: c349b4d56c338bc43c81667bb927518b923998cb
Component: engine
2013-08-21 15:48:39 +02:00
f2e7496ac3
proper resolv.conf parsing
...
Upstream-commit: 62e84785b6ffec04a39cf611d7eaff21f2532195
Component: engine
2013-08-21 15:23:12 +02:00
6fda0862e2
hot fix display in parallel pull and go fmt
...
Upstream-commit: d7979ef2d0044dc7def9238f0a1aed909f0590bb
Component: engine
2013-08-15 11:42:40 +00:00
951194f6f0
Merge pull request #1505 from dotcloud/improve_events
...
Add image name in /events
Upstream-commit: 15bc2240ac56a3f584bdc33865c896bac961c6a3
Component: engine
2013-08-14 15:40:36 -07:00
a74f9e3dd3
Add import for dotcloud/tar to replace std tar pkg
...
Upstream-commit: ec61c46bf73b8c727fe8de1982d86a1417a8a0c4
Component: engine
2013-08-12 22:42:29 +00:00
efc4a51c0c
Fixed typos
...
Upstream-commit: 9b2a5964fc2067014f24e26bd2f99873751ebdc3
Component: engine
2013-08-12 18:53:06 +01:00
2037ff0102
ensure the use oh IDs and add image's name in /events
...
Upstream-commit: 703905d7ece5b4a71ae1faf2743341ace98c4fbb
Component: engine
2013-08-12 11:50:03 +00:00
