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
Guillaume J. Charmes
6998c3c387
go fmt
2013-11-07 12:27:33 -08: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
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
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
Jérôme Petazzoni
cc851dbb3f
Catch errClosing error when TCP and UDP proxies are terminated.
2013-10-16 14:43:20 -07: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
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
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
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
Victor Vieux
946bbee39a
rebase master
2013-08-05 16:25:42 +00: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
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
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
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
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
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
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