beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
29445 commits 14 branches 412 tags 338 MiB
Commit graph

460 commits

Author SHA1 Message Date
SvenDowideit
5febba93ba IANA allocated Docker port: 2375 
2375/2376 are assigned:
http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=docker

For #1440

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-06-04 06:54:19 +10:00
unclejack
5aeb77296a Merge pull request #4430 from vbatts/vbatts-images_orphan 
Adding -f untagged=true flag to `docker images`
 2014-06-03 20:33:56 +03:00
Victor Vieux
b292928cd5 Merge pull request #5848 from unclejack/resumable_pulls 
resume pulling the layer on disconnect
 2014-06-02 14:07:01 -07:00
Vincent Batts
3a4e3ca327 filters: don't encode an empty set. update comments 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
 2014-06-02 16:33:52 -04:00
Vincent Batts
89a15fa235 filters: use json marshal, instead of beam/data 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
 2014-06-02 16:33:52 -04:00
Vincent Batts
f1cc7ce5d7 filter flag: split out for separate --filter flags 
adding tests and allowing for easy passing of filters.Args from client
to server.

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
 2014-06-02 16:33:51 -04:00
Vincent Batts
babd572015 filters: cleanup & fmt 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
 2014-06-02 16:33:51 -04:00
Vincent Batts
caf9b19b0c filters: remove out filter proc prototype 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
 2014-06-02 16:33:50 -04:00
Vincent Batts
5f3812ec97 filters, for images: start with untagged/tagged boolean 
This is a new feature and flag. (replaces the suggestion of a flag for
--untagged images).
The concept is to have a syntax to filter. This begins with this
filtering for the 'images' subcommand, and at that only filtering for
whether images are untagged.
  example like: docker rmi $(docker images -q --filter 'untagged=true')

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
 2014-06-02 16:33:50 -04:00
unclejack
2a1b7f222a resume pulling the layer on disconnect 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-06-02 21:41:22 +03:00
Alexandr Morozov
1ae37cef91 Remove unused and racy "used" param from streamformatter 
Also tests written
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-06-02 21:43:07 +04:00
Derek
02f4ae6c56 Use Timeout Conn wrapper to set read deadline for downloading layer 
Docker-DCO-1.1-Signed-off-by: Derek <crq@kernel.org> (github: crquan)
 2014-05-27 22:50:04 -07:00
Victor Vieux
f2baa364a1 improve numeric only id detection 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-05-27 21:03:12 +00:00
Victor Vieux
d74b6095c9 Merge pull request #5861 from crquan/fix-user-agent-trailing-space 
Remove Trailing Whitespace in User-Agent
 2014-05-19 12:08:53 -07:00
Victor Vieux
8eef1be29e Merge pull request #5782 from unclejack/fix_5270 2014-05-19 10:36:10 -07:00
Jonathan McCrohan
3cec63d56f client: Rip out HTTP check from docker version 
For background to this change please see:
https://github.com/dotcloud/docker/issues/4802
https://github.com/dotcloud/docker/pull/5670

Docker-DCO-1.1-Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com> (github: jmccrohan)
 2014-05-18 02:22:22 +01:00
Derek
42734394b0 Remove Trailing Whitespace in User-Agent 
After removed, the User-Agent shows in log like this:

[debug] http.go:160 https://index.docker.io/v1/repositories/busybox/images --
HEADERS: map[User-Agent:[docker/0.11.1-dev go/go1.2.2 git-commit/8887e00-dirty kernel/3.14.3-n1 os/linux arch/amd64]]

The code also moved all validation work into validVersion,
to keep the main logic as clean.

Docker-DCO-1.1-Signed-off-by: Derek <crq@kernel.org> (github: crquan)
 2014-05-16 17:15:04 -07:00
unclejack
1dedcd0d37 add ValidateContextDirectory to utils/utils.go 
This commit adds a function which can be used to ensure all contents of
a directory can be accessed.

This function doesn't follow symlinks to check if they're pointing to
files which exist. Such symlinks can be useful later.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-05-17 02:38:28 +03:00
Victor Vieux
bc22c9948c Merge pull request #5756 from crosbymichael/move-units-to-pkg 
Move duration and size to units pkg
 2014-05-14 11:36:14 -07:00
Victor Vieux
c78b390b6c Merge pull request #5780 from vbatts/vbatts-start_tarsum_test 
tarsum: start a test for TarSum
 2014-05-14 11:28:26 -07:00
Vincent Batts
d153740d9c tarsum: adding benchmarks 
to cover a couple of use-cases:
* 1mb file, using no compression
* 1mb file, using compression
* 1024 1k files, using no compression
* 1024 1k files, using compression

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
 2014-05-14 11:48:17 -04:00
unclejack
219b7ae8b5 add UpdateSuffixarray and refactor TruncIndex 
This commit refactors TruncIndex to make it possible to add container
ids to the TruncIndex without updating the Suffixarray.

This is useful during the Docker daemon's startup when we don't want to
update the Suffixarray for every container we add.

Add continues to function like before.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-05-14 17:57:59 +03:00
Vincent Batts
cfd1227e91 tarsum: test gofmt 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
 2014-05-13 15:14:32 -04:00
Vincent Batts
efa369a6ee tarsum: adding the layer for "scratch" image 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
 2014-05-13 15:08:48 -04:00
Vincent Batts
461f801f83 tarsum: start a test for TarSum 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
 2014-05-13 14:57:31 -04:00
Michael Crosby
dcf81f95fd Move Follow symlink to pkg 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-13 10:35:57 -07:00
Michael Crosby
d33b4655c4 Move duration and size to units pkg 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-12 17:05:07 -07:00
Guillaume J. Charmes
3f8ffb461a
Remove signal_freebsd (already in pkg/signal) 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
 2014-05-11 01:03:12 -07:00
Victor Vieux
3744452ecf add resolvconf 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-05-05 22:55:32 +00:00
Alexandr Morozov
d1297feef8 Timestamps for docker logs. 
Fixes #1165
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-05-01 20:40:36 +04:00
unclejack
d072f316e3 change inode map to struct from bool 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-04-17 20:08:14 +03:00
Michael Crosby
413190e159 Merge pull request #5172 from pnasrat/5166-large-image-graph-restore 
Enable construction of TruncIndex from id array.
 2014-04-14 10:31:16 -07:00
Paul Nasrat
84a76f2796 Add benchmark tests for TruncIndex. 
Compare add vs new.

Some historical data in PR #5172.

Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com> (github: pnasrat)
 2014-04-13 22:36:15 -04:00
Kato Kazuyoshi
0f72486346 Fix utils.FollowSymlinkInScope's infinite loop bug 
fs_test.go doesn't finish if Docker's code is placed under a directory
which has symlinks between / and the directory.
For example, the below doesn't finish before the change.

  /home -> usr/home
  FollowSymlinkInScope("/home/bob/foo/bar", "/home/bob/foo")

Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
 2014-04-12 07:37:18 +09:00
Kato Kazuyoshi
e3e078ca2f Add the test to reproduce the issue even in "make test" 
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
 2014-04-12 07:37:17 +09:00
Paul Nasrat
4f169c2db5 Enable construction of TruncIndex from id array. 
Fixes #5166

Current graph.restore is essentially O(n^2 log n) due to how
suffixarray creation works.

Rather than create/append/create new this supports creation from a seed
array of ids.

Functional testing shows this eliminates the hang on Creating image
graph reported on list.

Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com> (github: pnasrat)
 2014-04-11 16:39:58 -04:00
unclejack
e76113be6c Merge pull request #4925 from creack/fix_logs 
Fix expending buffer in StdCopy
 2014-03-31 23:15:07 +03:00
Victor Vieux
9709c31d1b fix import display 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-03-31 19:21:57 +00:00
Guillaume J. Charmes
e4aaacc235
Fix expending buffer in StdCopy 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
 2014-03-31 10:54:06 -07:00
Alexander Larsson
7a3070a600 Add --opt arguments for drivers 
In order to handle special configuration for different drivers we
make the Config field a map to string array. This lets
us use it for lxc, by using the "lxc" key for those, and we can
later extend it easily for other backend-specific options.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-03-27 21:47:47 +01:00
Daniel Norberg
fbfac21ed4 configurable dns search domains 
Add a --dns-search parameter and a DnsSearch
configuration field for specifying dns search
domains.

Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)
 2014-03-19 10:49:25 -04:00
Guillaume J. Charmes
f9bd6c860d Merge pull request #4364 from vieux/move_clone 
move git clone from daemon to client
 2014-03-17 11:36:56 -07:00
Michael Crosby
5239aa1f11 Move server and buildfile into server pkg 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-14 09:37:08 -07:00
Victor Vieux
03f0ec35ae as you could have multiple messages per line with streams, don't \r 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-03-13 22:26:42 +00:00
Victor Vieux
8301fc8e56 move git clone from daemon to client 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)

add a little doc
 2014-03-11 01:23:14 +00:00
Michael Crosby
b5a544b02e Merge pull request #4563 from creack/signal-improvment 
Signal improvments
 2014-03-10 17:59:17 -07:00
Guillaume J. Charmes
c563262239 Move signal to pkg 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
 2014-03-10 17:36:32 -07:00
unclejack
8bcb156694 Merge pull request #3985 from creack/add_freebsd_support 
Add freebsd client support
 2014-03-11 00:58:30 +02:00
Guillaume J. Charmes
bb43761940
Merge branch 'master' into add_freebsd_support 
Conflicts:
	archive/archive.go
	archive/start_unsupported.go
 2014-03-10 13:20:49 -07:00
Michael Crosby
82a5439835 Move image into sub pkg 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-09 22:59:29 -07:00
unclejack
611acf7a7c 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)
 2014-03-03 23:00:53 +02:00
unclejack
aac9542a68 Merge pull request #4412 from crosbymichael/fix-env-clobber 
Don't always just append env vars, replace defaults with ones from confi...
 2014-03-03 22:52:03 +02:00
Michael Crosby
b02b933c62 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)
 2014-03-01 03:46:45 -08:00
Guillaume J. Charmes
d3a6ee1e55
Make the chan for utils.Go buffered in order to avoid goroutine leak 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
 2014-02-28 16:35:43 -08:00
Tianon Gravi
2ca4e0ea60 Use a more defensive vendored archive/tar import path to make it clear this isn't upstream's released archive/tar 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-02-27 09:43:44 -07:00
Michael Crosby
01dc79b3ea Merge pull request #4276 from tianon/json-stream-newlines 
Add newlines to the JSON stream functions
 2014-02-26 21:25:42 -05:00
Victor Vieux
389eba4396 Merge pull request #4297 from dotcloud/add-simple-checksum 
registry: Added simple checksums (sha256) for layers
 2014-02-26 18:15:48 -08:00
unclejack
a42ef866ed Merge pull request #4316 from tianon/more-lenient-kernel-version 
Adjust kernel version parsing to be more lenient of strange things like "3.12-1-amd64"
 2014-02-26 16:15:56 +02:00
Victor Vieux
b7a0f62f0f fix divide by zero error 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-02-25 08:01:46 +00:00
Tianon Gravi
2ae8180de2 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)
 2014-02-24 13:38:58 -07:00
Sam Alba
8d230cf89c registry: Added simple checksums (sha256) for layers 
Docker-DCO-1.1-Signed-off-by: Sam Alba <sam@docker.com> (github: samalba)
 2014-02-23 18:50:04 -08:00
Tianon Gravi
060da572d2 Add newlines to the JSON stream functions 
This makes the JSON streams a _lot_ easier to parse in less well-baked JSON parsers, and no less so in better ones.

Line-based JSON streams are very, very common, where simply chunk-based is not very common at all.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-02-21 00:07:44 -07:00
Victor Vieux
518670f3d8 Merge pull request #4153 from crosbymichael/move-proxy 
Move proxy into pkg
 2014-02-17 14:51:16 -08:00
Tianon Gravi
b762d3a739 Add vendored archive/tar that includes xattrs patch 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-02-17 08:20:21 -07:00
Michael Crosby
8c39db8f96 Move proxy into pkg 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-14 15:48:05 -08:00
unclejack
31dde3ea05 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)
 2014-02-13 13:54:37 +02:00
Tianon Gravi
da04f49b38 Move even more stuff into dockerversion 
Also, use it in all the places. :)

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-02-11 17:26:54 -07:00
Guillaume J. Charmes
547ac42199
Add Freebsd client support 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
 2014-02-06 16:40:39 -08:00
Tianon Gravi
ee93f6185b Move UserLookup functionality into a separate pkg/user submodule that implements proper parsing of /etc/passwd and /etc/group, and use that to add support for "docker run -u user:group" and for getting supplementary groups (if ":group" is not specified) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-01-31 20:15:24 -07:00
Tianon Gravi
065dd231dd Update/fix build tags, Dockerfile, and release.sh for proper building and releasing of linux/386 and linux/arm cross-compiled client binaries 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-01-31 03:16:42 -07:00
Guillaume J. Charmes
45dd051e8e Remove all darwin specific files and use more generic _unsupported with build tags. 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
 2014-01-30 23:10:56 +00:00
Brandon Philips
87fb2c973d server: add socket activation 
This adds the ability to socket activate docker by passing in
`-H fd://*` along with examples systemd configuration files.

The fastest way to test this is to run:

```
/usr/lib/systemd/systemd-activate -l 127.0.0.1:2001 /usr/bin/docker -d -H 'fd://*'
docker -H tcp://127.0.0.1:2001 ps
```

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
 2014-01-27 17:17:07 -08:00
Victor Vieux
9dcbdbc4b1 move pull and import to a job 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-24 14:46:31 -08:00
Charles Lindsay
dea3c2655d Add comment about ignoring Sscanf error 
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us> (github: chazomaticus)
 2014-01-22 09:32:50 -08:00
Charles Lindsay
cce099aa34 Re-add kernel Flavor tests 
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us> (github: chazomaticus)
 2014-01-21 09:56:53 -08:00
Charles Lindsay
b78ae3b652 Re-add Flavor to KernelVersionInfo 
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us> (github: chazomaticus)
 2014-01-20 21:26:23 -08:00
Charles Lindsay
5b97e00438 Use Sscanf instead of regexp 
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us> (github: chazomaticus)
 2014-01-20 21:02:37 -08:00
Charles Lindsay
14b2b2b7c2 Fix apparent typo 
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us> (github: chazomaticus)
 2014-01-20 19:49:40 -08:00
Charles Lindsay
d2c9c1036b 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)
 2014-01-20 19:49:39 -08:00
Charles Lindsay
fc30346086 Add failing test for odd kernel version 
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us> (github: chazomaticus)
 2014-01-20 19:49:39 -08:00
Michael Crosby
03a25c0800 Merge branch 'fix-registry-push-tags' of https://github.com/codeaholics/docker into codeaholics-fix-registry-push-tags 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-01-20 11:23:09 -08:00
Michael Crosby
fdd8d4b7d9 Stream the cp operation on the client 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-01-17 10:51:29 -08:00
James Allen
37fcbfa1f4 Add RWMutex lock into TruncIndex to fix race condition when inserting values 
The idx.index array is overwritten when a new value is inserted to the index.
When two containers are created concurrently, their ids are inserted to the
index and one can overwrite the other leaving one of ids missing from the
index. Adding a RWMutex lock around read/write operations fixes this.

Docker-DCO-1.1-Signed-off-by: James Allen <jamesallen0108@gmail.com> (github: jpallen)
 2014-01-15 17:30:00 +00:00
Fabio Falci
89bed4337d Use https to get the latest docker version 
To avoid unexpected results since docker was using http.
For instance, my broadband doesn't return not found when it's down but
a html page saying that the internet is down. Docker was showing that
html instead of ignoring it.

Fix #3570

Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
 2014-01-13 20:37:29 +00:00
Guillaume J. Charmes
762a0cc472 Cleanup utils.Download 
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
 2014-01-08 14:22:49 -08:00
Guillaume J. Charmes
c6350bcc24 Disable compression for build. More space usage but much faster upload 
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
 2014-01-08 14:21:13 -08:00
Danny Yates
6b48761ce9 Remove unneeded DependencyGraph 
Docker-DCO-1.0-Signed-off-by: Danny Yates <danny@codeaholics.org> (github: codeaholics)
 2014-01-08 10:14:14 +00:00
Guillaume J. Charmes
1137ecf7d1
Disable compression for build. More space usage but much faster upload 
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
 2014-01-07 17:46:04 -08:00
Tianon Gravi
8f3b8f3835 Run 'gofmt -s -w' 2014-01-06 22:14:35 -07:00
Victor Vieux
4e414f6205 Merge pull request #3377 from cpuguy83/3333-fix_-H_default 
Make blank -H option default to the same as no -H was sent
 2014-01-06 11:30:27 -08:00
Michael Crosby
4f31141e13 Merge pull request #3310 from pnasrat/cgroups-subpackage 
Extract cgroups utilities to own submodule.
 2014-01-06 11:27:29 -08:00
Guillaume J. Charmes
194eb246ef Merge pull request #3353 from creack/improve_add_cache 
Improve add cache
 2014-01-02 16:07:33 -08:00
Paul Nasrat
c561212b83 Extract cgroups utilities to own submodule. 
Use mountinfo rather than for cgroups parsing.
Make helper method private and change name.
Makes method naming more explicit rather than GetThisCgroup.
Use upstream term subsystem rather than cgroupType.
 2014-01-02 17:54:57 -05:00
Michael Crosby
81e596e272 Merge pull request #3287 from vieux/fix_progressbar_display_push 
fix progressbar in docker push
 2014-01-02 13:38:11 -08:00
Brian Goff
8b82b0dfe7 Make blank -H option default to the same as no -H was sent 2013-12-29 14:36:46 -05:00
Guillaume J. Charmes
894d4a23fb
Change BuildFile in order to use TarSum instead of custom checksum 2013-12-26 16:16:26 -08:00
Guillaume J. Charmes
fc9f4d8bad
Log files name along with their checksum in TarSum + add a Method to retrieve the checksum map 2013-12-26 16:01:36 -08:00
Guillaume J. Charmes
360078d761 Remove old debug from tarsum 2013-12-26 15:39:06 -08:00
Solomon Hykes
7ce7516c12 Move utility package 'term' to pkg/term 2013-12-23 23:42:37 +00:00
Victor Vieux
85f9b778f5 fix progressbar in docker push 2013-12-20 16:55:41 -08:00
Guillaume J. Charmes
e4561438f1
Add arch/os info to user agent (Registry) 2013-12-20 08:19:25 -08:00
Guillaume J. Charmes
636dfc82b0 Merge pull request #3064 from tianon/custom-dockerinit-path 
Allow custom dockerinit path
 2013-12-19 14:31:41 -08:00
Andy Rothfusz
1acefac97e Merge pull request #3234 from creack/default_unix_path 
Default unix path
 2013-12-17 16:24:01 -08:00
Tianon Gravi
2ed1001c57 Allow packagers to specify a custom dockerinit lookup location via DOCKER_INITPATH in dynbinary 
Only necessary if distro policy dictates that the path deviate from the paths already listed in utils/utils.go - please refrain from using it otherwise.
 2013-12-16 22:29:08 -07:00
Tianon Gravi
2035af44aa Always copy dockerinit locally, regardless of whether our docker binary is static, because even it might get deleted or moved/renamed 2013-12-16 22:29:00 -07:00
Guillaume J. Charmes
69a31c3386
Improve TestParseHost 2013-12-16 16:35:56 -08:00
Guillaume J. Charmes
20605eb310
Allow to use -H unix:// like -H tcp:// 2013-12-16 16:30:23 -08:00
Johannes 'fish' Ziemke
4faba4fae7 Reimplement lxc-ps 
Instead of calling lxc-ps in top endpoint, we reimplement it by
calling ps and filter for pids running in a given container.
 2013-12-16 13:30:35 +01:00
Guillaume J. Charmes
8fd9633a6b
Improve FollowLink to handle recursive link and be more strick 2013-12-11 17:19:02 -08:00
Michael Crosby
f396c42cad Fix volumes on the host by following symlinks in a scope 2013-12-11 16:31:02 -08:00
Victor Vieux
2c646b2d46 disable progressbar in non-terminal 2013-12-06 14:09:27 -08:00
Victor Vieux
05f416d869 fix jsonmessage in build 2013-12-06 14:09:27 -08:00
Victor Vieux
4bc100b494 fix jsonmessage 2013-12-04 11:57:18 -08:00
Victor Vieux
12180948be remove unused parameter in Download 2013-12-04 11:54:11 -08:00
Michael Crosby
dc9f8bf072 Merge pull request #2790 from proppy/fix-tar 
utils: remove dotcloud/tar dep
 2013-12-04 11:06:13 -08:00
Sam Alba
258d707548 Merge pull request #2339 from shin-/private_reg_auth 
Private registry auth
 2013-12-03 15:29:38 -08:00
Victor Vieux
f50fe14e13 Handle small screens 2013-12-03 14:21:33 -08:00
shin-
bbf9135adc Added HTTPAuthDecorator 2013-12-03 16:24:47 +01:00
Guillaume J. Charmes
5cd09dc115
small reformatting jsonmessage 2013-12-02 11:49:11 -08:00
Guillaume J. Charmes
6ea3b9651b
Fix displayJson behavior (dont add newline) 2013-12-02 11:47:13 -08:00
Michael Crosby
8cc524996a Merge pull request #2924 from tianon/strict-fhs-compatibility 
Add proper dockerinit path support for distros that use FHS 2.3
 2013-12-02 11:35:36 -08:00
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