Michael Crosby
fe571dd293
Merge pull request #2829 from dotcloud/refactor_opts
...
Refactor opts
2013-12-02 10:41:30 -08:00
Michael Crosby
e1414a4c39
Merge pull request #2945 from dotcloud/refactor_stream
...
Refactor stream
2013-12-02 10:31:09 -08:00
Johannes 'fish' Ziemke
b04c6466cd
Make docker build return exit code of build step
...
If a command during build fails, `docker build` now returns with
the exit code of that command.
This makes it necessary to change the build api endpoint to
return a json object stream.
2013-12-02 17:52:37 +01:00
Guillaume J. Charmes
77c94175bd
Make CopyEscapable consistent with Copy and return `nil` in case of success instead of io.EOF
2013-11-28 16:57:51 -08:00
Victor Vieux
d3cc558d14
add test
2013-11-28 16:28:31 -08:00
Victor Vieux
b36dd3f9cc
fix display on test
2013-11-28 14:40:17 -08:00
Victor Vieux
ebc36b879d
add progressbar and time
2013-11-28 14:33:18 -08:00
Victor Vieux
597e0e69b4
split in 3 files
2013-11-28 12:16:57 -08:00
Tianon Gravi
438607ecc3
Add proper dockerinit path support for distros that use FHS 2.3
2013-11-28 11:11:30 -07:00
Guillaume J. Charmes
1ba11384bf
Refactor Opts
2013-11-26 17:46:06 +00:00
Victor Vieux
110c4f2043
create a copy of dockerinit
2013-11-25 20:21:54 -08:00
Guillaume J. Charmes
19df6c32c0
Merge branch 'master' into use_utc_time
...
Conflicts:
image.go
2013-11-25 19:01:13 -08:00
Michael Crosby
e69bbd239e
Merge branch 'master' into 0.6.5-dm-plugin
2013-11-22 14:06:59 -08:00
Guillaume J. Charmes
476559458d
Reformatting parseRun and partParse
2013-11-22 11:58:02 -08:00
Mark Allen
8b0cd60019
Pass terminal setting to display utils
2013-11-22 00:05:55 -06:00
Michael Crosby
0cecc2a78c
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
container.go
image.go
2013-11-21 17:18:41 -08:00
Guillaume J. Charmes
806abe90ba
Use UTC for time
2013-11-21 16:43:36 -08:00
Johan Euphrosine
b3bee7e0c4
utils: remove dotcloud/tar dep
2013-11-20 18:45:12 +00:00
Guillaume J. Charmes
28d4cbbc59
Merge branch 'master' into creack-merge-master
...
Conflicts:
api_params.go
graph.go
graph_test.go
image.go
integration/api_test.go
integration/container_test.go
integration/runtime_test.go
runtime.go
2013-11-19 14:58:12 -08:00
Guillaume J. Charmes
5e941f1ca0
Lintify code with confidence=1
2013-11-18 16:24:11 -08:00
Michael Crosby
51576069ad
Merge pull request #2694 from shykes/separate-integration-tests
...
Separate integration tests
2013-11-15 18:21:34 -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
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