clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-28 00:50:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,913 Commits 9 Branches 112 Tags
bb4d24de06e96efea180bee9761dfa181b6439b6
Commit Graph
12913 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Arnaud Porterie bb4d24de06 Merge pull request #10469 from dmcgowan/v2-registry-push-fallback 
Add push fallback to v1 for the official registry
 2015-01-30 16:43:23 -08:00
Alexander Morozov b8d65183c3 Merge pull request #10465 from jfrazelle/tomlv 
Validate toml
 2015-01-30 16:27:07 -08:00
Tibor Vass ee0b0464c6 Merge pull request #10394 from dmcgowan/v2-manifest-save-tarsum 
V2 manifest save tarsum
 2015-01-30 18:22:50 -05:00
Jessica Frazelle d245a8a706 Validate toml 
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
 2015-01-30 15:22:11 -08:00
Alexander Morozov d8ad7c0edc Merge pull request #10456 from dmcgowan/revert-client-signature 
Revert client signature
 2015-01-30 14:54:27 -08:00
Derek McGowan 7d62943178 Add push fallback to v1 for the official registry 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-01-30 14:37:44 -08:00
Derek McGowan 403d981d70 Revert client signature 
Supports multiple tag push with daemon signature

Fixes #10444

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-01-30 14:20:32 -08:00
Michael Crosby 1dc1b93451 Merge pull request #10460 from estesp/10387-setup-tcp-keepalive 
Setup TCP keep-alive on hijacked HTTP(S) client <--> daemon sessions
 2015-01-30 11:31:31 -08:00
Michael Crosby 87fd6375f1 Merge pull request #9943 from gdi2290/update-authors 
Update AUTHORS file and .mailmap
 2015-01-30 09:59:31 -08:00
Josh Hawn 3414307306 Remove Checksum field from image.Image struct 
The checksum is now being stored in a separate file beside the image
JSON file.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2015-01-30 09:37:50 -08:00
Tibor Vass 3b0326fc81 Merge pull request #10441 from brahmaroutu/enable_ibm_power_z 
Adding IBM Power and Z as valid platforms to the docker
 2015-01-30 11:48:41 -05:00
Srini Brahmaroutu 7d7a002e51 Removing the check on Architecture to build and run Docker on IBM Power and Z platforms 
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-01-30 16:16:17 +00:00
Phil Estes f73a6b3845 Setup TCP keep-alive on hijacked HTTP(S) client <--> daemon sessions 
Fixes #10387

Without TCP keep-alive set on socket connections to the daemon, any
long-running container with std{out,err,in} attached that doesn't
read/write for a minute or longer will end in ECONNTIMEDOUT (depending
on network settings/OS defaults, etc.), leaving the docker client side
believing it is still waiting on data with no actual underlying socket
connection.

This patch turns on TCP keep-alive for the underlying TCP connection
for both TLS and standard HTTP hijacked daemon connections from the
docker client, with a keep-alive timeout of 30 seconds.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2015-01-30 10:50:27 -05:00
James Turnbull fb55c0ecc6 Merge pull request #10448 from jfrazelle/why-the-hell-are-we-sudoing-everything 
Some small updates to the dev env docs.
 2015-01-30 08:47:40 +01:00
Derek McGowan e9f6f1a930 Store tar checksum in separate file 
Fixes #10432

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-01-29 21:28:20 -08:00
Michael Crosby 144ae9b0c7 Merge pull request #10449 from LK4D4/fix_race_monitor 
Remove explicit setting of ExitCode
 2015-01-29 16:07:28 -08:00
Jessica Frazelle 80b843b731 Some small updates to the dev env docs. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2015-01-29 16:01:05 -08:00
Jessie Frazelle d748ec31d5 Merge pull request #10446 from dmcgowan/defer-key-file-creation 
Defer creation of trust key file until needed
 2015-01-29 15:23:35 -08:00
Michael Crosby 7b65de8771 Merge pull request #10445 from jlhawn/no_checksum_on_install 
No longer compute checksum when installing images.
 2015-01-29 15:13:29 -08:00
Alexander Morozov e7f6433109 Remove explicit setting of ExitCode 
That will be set in defer anyway. Also there was race between setting
ExitCode and inspect.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-01-29 14:50:42 -08:00
Josh Hawn e636df8d96 No longer compute checksum when installing images. 
While checksums are verified when a layer is pulled from v2 registries,
there are known issues where the checksum may change when the layer diff
is computed again. To avoid these issues, the checksum should no longer
be computed and stored until after it has been extracted to the docker
storage driver. The checksums are instead computed lazily before they
are pushed to a v2 registry.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2015-01-29 13:52:59 -08:00
Derek McGowan 0eed1f4d8d Defer creation of trust key file until needed 
Fixes #10442

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-01-29 13:46:12 -08:00
Alexander Morozov 8dbaed1d96 Merge pull request #10430 from duglin/AddBuilderFolks 
Add builder folks to the top-level maintainers file
 2015-01-29 13:32:56 -08:00
Fred Lifton c12fb48a8a Merge pull request #10435 from SvenDowideit/add-dhe-placeholder-docs 
DHE documentation placeholder and Navbar changes
 2015-01-29 10:23:57 -08:00
Fred Lifton 5b9b5aff06 Merge pull request #10293 from SvenDowideit/test-9952 
comment out the docker and curl lines we'll run later
 2015-01-29 10:18:53 -08:00
Fred Lifton 9e10a888a3 Merge pull request #10428 from mehulkar/patch-1 
Improve explanation of port mapping from containers
 2015-01-29 10:07:24 -08:00
Mehul Kar f1bc02e91f Improve explanation of port mapping from containers 
Signed-off-by: Mehul Kar <mehul.kar@gmail.com>
 2015-01-29 09:09:44 -08:00
James Turnbull ba8e1673ad Merge pull request #10351 from duglin/FixDocsWorkdir 
Fix docs so WORKDIR mentions it works for COPY and ADD too
 2015-01-29 09:52:01 -05:00
Sven Dowideit 0ce3a49d64 DHE documentation placeholder and Navbar changes 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-01-29 20:50:43 +10:00
Alexander Morozov d400ac756c Merge pull request #10433 from guoxiuyan/Fix_typo 
Fix a minor typo
 2015-01-28 20:57:35 -08:00
Doug Davis 761a020f9d Add builder folks to the top-level maintainers file 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-01-28 18:32:38 -08:00
Tibor Vass fb9363eb2a Merge pull request #10368 from jfrazelle/lingering-exec-test 
Move one last exec test :)
 2015-01-28 21:21:05 -05:00
guoxiuyan 07d190a61c Fix a minor typo 
Signed-off-by: Guo Xiuyan <guoxiuyan@huawei.com>
 2015-01-29 10:15:56 +08:00
James Turnbull c9b03c6095 Merge pull request #10142 from thaJeztah/docs-use-example-image 
Replace "base" with "debian" in API documentation
 2015-01-28 20:40:02 -05:00
Sebastiaan van Stijn c0969ed3d8 Replace "base" with "ubuntu" in documentation 
The API documentation uses the "base" image in various
places. The "base" image is deprecated and it is no longer
possible to download this image.

This changes the API documentation to use "ubuntu" in stead.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-01-28 22:54:10 +01:00
Michael Crosby b505db5e3c Merge pull request #10420 from tianon/ubuntu-version 
Update .deb version numbers to be more sane
 2015-01-28 13:50:12 -08:00
Tianon Gravi 0fab79f203 Update .deb version numbers to be more sane 
Example output:
```console
root@906b21a861fb:/go/src/github.com/docker/docker# ./hack/make.sh binary ubuntu
bundles/1.4.1-dev already exists. Removing.

---> Making bundle: binary (in bundles/1.4.1-dev/binary)
Created binary: /go/src/github.com/docker/docker/bundles/1.4.1-dev/binary/docker-1.4.1-dev

---> Making bundle: ubuntu (in bundles/1.4.1-dev/ubuntu)
Created package {:path=>"lxc-docker-1.4.1-dev_1.4.1~dev~git20150128.182847.0.17e840a_amd64.deb"}
Created package {:path=>"lxc-docker_1.4.1~dev~git20150128.182847.0.17e840a_amd64.deb"}

```

As noted in a comment in the code here, this sums up the reasoning for this change: (which is how APT and reprepro compare versions)
```console
$ dpkg --compare-versions 1.5.0 gt 1.5.0~rc1 && echo true || echo false
true
$ dpkg --compare-versions 1.5.0~rc1 gt 1.5.0~git20150128.112847.17e840a && echo true || echo false
true
$ dpkg --compare-versions 1.5.0~git20150128.112847.17e840a gt 1.5.0~dev~git20150128.112847.17e840a && echo true || echo false
true
```

ie, `1.5.0` > `1.5.0~rc1` > `1.5.0~git20150128.112847.17e840a` > `1.5.0~dev~git20150128.112847.17e840a`

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-01-28 14:26:40 -07:00
Tibor Vass 70fbd45a5c Merge pull request #10123 from duglin/Issue10097 
Build CMD/ENTRYPOINT cache strings properly
 2015-01-28 14:43:16 -05:00
Michael Crosby 17e840a47a Merge pull request #10416 from icecrime/update_fish_completion 
Update fish completion for 1.5.0
 2015-01-28 10:28:47 -08:00
Arnaud Porterie 45ef269498 Merge pull request #10406 from estesp/fixup-ipv6-bridge-creation 
Fix bridge initialization for IPv6 if IPv4-only docker0 exists
 2015-01-28 10:17:45 -08:00
Jessie Frazelle 13b6461570 Merge pull request #10398 from LK4D4/export_daemon_vars 
Export DOCKER_GRAPHDRIVER and DOCKER_EXECDRIVER in integration-cli
 2015-01-28 09:44:39 -08:00
Arnaud Porterie 9cea20ffc5 Update fish completion for 1.5.0 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-01-28 08:52:06 -08:00
Arnaud Porterie 2cb82c11cf Merge pull request #10372 from dmcgowan/v2-registry-buffer-push 
Buffer tar file on v2 push
 2015-01-28 08:47:21 -08:00
Arnaud Porterie f23c136a95 Merge pull request #10357 from jfrazelle/bash-completion-stats 
Add completion for stats.
 2015-01-28 08:29:06 -08:00
Tibor Vass c575cc697e Merge pull request #10403 from stevvooe/v2-status-code-narrow 
Open up v2 http status code checks for put and head checks
 2015-01-28 09:38:45 -05:00
Solomon Hykes c1f3fe70df Merge pull request #9137 from shykes/contribution-docs 
Improve project organization
 2015-01-28 01:19:29 -08:00
Phil Estes 0c8d17b5c1 Fix bridge initialization for IPv6 if IPv4-only docker0 exists 
This fixes the daemon's failure to start when setting --ipv6=true for
the first time without deleting `docker0` bridge from a prior use with
only IPv4 addressing.

The addition of the IPv6 bridge address is factored out into a separate
initialization routine which is called even if the bridge exists but no
IPv6 addresses are found.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2015-01-27 23:54:26 -05:00
James Turnbull 8d49ebd338 Merge pull request #10408 from estesp/fix-ipv6-docs 
Fix incorrect IPv6 addresses/subnet notations in docs
 2015-01-27 23:24:52 -05:00
Phil Estes 5945de43b0 Fix incorrect IPv6 addresses/subnet notations in docs 
Fixes a few typos in IPv6 addresses. Will make it easier for users who
actually try and copy/paste or use the example addresses directly.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2015-01-27 22:45:43 -05:00
Alexander Morozov 8893dee098 Merge pull request #10404 from liusdu/liu-dev 
fix a minor typo in daemon/container.go
 2015-01-27 18:26:40 -08:00