04d68b69ad
handle symlinks for Docker's root dir & TMPDIR
...
This removes the incomplete symlink handling from engine.go and it adds
it one place in docker.go.
It also enables handling symlinks for TMPDIR.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 611acf7a7c1c3a6796e862fb94143890a9aa4573
Component: engine
2014-03-03 23:00:53 +02:00
e8666de768
Don't always just append env vars, replace defaults with ones from config
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: b02b933c6292c539833c15c15299628ac3360572
Component: engine
2014-03-01 03:46:45 -08:00
e085e22f6b
Adjust kernel version parsing to be more lenient of strange things like "3.12-1-amd64"
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 2ae8180de2d814e04834d41f20b2c96a06995678
Component: engine
2014-02-24 13:38:58 -07:00
171ba8d692
disallow tcp:// from defaulting to 127.0.0.1:4243
...
This stops docker from accepting tcp:// as a valid bind address.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 31dde3ea05e1cf4c1f45083c1b6129e8c2a362df
Component: engine
2014-02-13 13:54:37 +02:00
875dd77195
Re-add kernel Flavor tests
...
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us > (github: chazomaticus)
Upstream-commit: cce099aa34e9588abc778b5f106bf862d4a838b0
Component: engine
2014-01-21 09:56:53 -08:00
185397ce27
Remove Flavor from KernelVersionInfo
...
Also change to parsing it with regexp to keep things simple.
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us > (github: chazomaticus)
Upstream-commit: d2c9c1036b94b0c3e7fa3f591fa83f9c95f49406
Component: engine
2014-01-20 19:49:39 -08:00
7e4afd3263
Add failing test for odd kernel version
...
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us > (github: chazomaticus)
Upstream-commit: fc30346086a890687d145c33aa8fb3d0ad6a4b7e
Component: engine
2014-01-20 19:49:39 -08:00
38f9c632bb
Remove unneeded DependencyGraph
...
Docker-DCO-1.0-Signed-off-by: Danny Yates <danny@codeaholics.org > (github: codeaholics)
Upstream-commit: 6b48761ce92e5f9590fd8b2723176ab72d297e6c
Component: engine
2014-01-08 10:14:14 +00:00
af7e2d6bbd
Run 'gofmt -s -w'
...
Upstream-commit: 8f3b8f383519452001cc05bf6505e9c301ebe954
Component: engine
2014-01-06 22:14:35 -07:00
cc877515e3
Make blank -H option default to the same as no -H was sent
...
Upstream-commit: 8b82b0dfe74684b5ea30b7487475f7ca4abcc58e
Component: engine
2013-12-29 14:36:46 -05:00
d49fddb652
Improve TestParseHost
...
Upstream-commit: 69a31c33864abeaacbe9a07e50dd0cd8d406b15e
Component: engine
2013-12-16 16:35:56 -08:00
706b718f39
Allow to use -H unix:// like -H tcp://
...
Upstream-commit: 20605eb310f0b57bd06eea80ec63c5022fc83bde
Component: engine
2013-12-16 16:30:23 -08:00
cea9cd6554
gofmt
...
Upstream-commit: b00d5f018541bf141dc4732ad6d71d23b8c28b43
Component: engine
2013-11-13 19:25:55 +00:00
5ec9c64577
modify test of GetNameserversAsCIDR for its regex change.
...
Upstream-commit: 879aa29cb09c641bbd510eed03647f8f85f0d559
Component: engine
2013-11-12 18:18:30 +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
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
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
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
cebebc8343
gofmt
...
Upstream-commit: 6678a26d1c94e7838c055a3da3b91ae3de8c3e3c
Component: engine
2013-09-09 15:11:30 -07: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
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
f2e7496ac3
proper resolv.conf parsing
...
Upstream-commit: 62e84785b6ffec04a39cf611d7eaff21f2532195
Component: engine
2013-08-21 15:23:12 +02:00
efc4a51c0c
Fixed typos
...
Upstream-commit: 9b2a5964fc2067014f24e26bd2f99873751ebdc3
Component: engine
2013-08-12 18:53:06 +01:00
74373c4d59
Update utils_test.go
...
Upstream-commit: dcf9dfb12961fc8101624af0b925d026fde4cde1
Component: engine
2013-08-05 16:32:25 -07:00
71b5dff299
Consider empty /etc/resolv.conf as local dns + add unit test
...
Upstream-commit: 3e9575e275c40acb04c505fa14c1ac63ba490b75
Component: engine
2013-08-02 15:23:36 -07:00
77e59c2148
add ParseRepositoryTag tests
...
Upstream-commit: 3852d0599097581d5dc0bcfcb7aa010d564beb9a
Component: engine
2013-07-29 12:16:01 +00:00
f380201be8
fix error in utils tests
...
Upstream-commit: 2e3b660dd0d49dc78f4c486e952ea6db9c007d6a
Component: engine
2013-07-19 13:56:36 +00:00
ef03a6ab8c
Hotfix: make sure ./utils tests pass
...
Upstream-commit: 1004d57b85fc3714b089da4c457228690f254504
Component: engine
2013-07-15 17:58:23 -07:00
ab69a9cf4c
fix regrettion in utils tests introduced by #980
...
Upstream-commit: eca9f9c1a1e436167eb660ad700f3f9f5189bae4
Component: engine
2013-06-24 16:12:39 +00:00
8ec498cc12
add tests
...
Upstream-commit: 9632bf228744dddfae2c303a0f2e8b962b6e0673
Component: engine
2013-06-19 12:40:01 +00:00
183381f196
switch to SI standard and add test
...
Upstream-commit: b45143da9b275b5003c23667b0988ad93f383b11
Component: engine
2013-05-23 10:29:09 +00:00
afbdda9037
Update utils_test.go
...
Upstream-commit: 10f5b6486c118d6be26bb4f8973629a6aaff1d52
Component: engine
2013-05-15 17:46:01 -07:00
bc6fad489c
Create a subpackage for utils
...
Upstream-commit: 2e69e1727b4d5698a90c24c5800eecd5401dc319
Component: engine
2013-05-14 22:37:35 +00:00
