clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-08-23 15:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,886 Commits 9 Branches 112 Tags
5b9b5aff06aa0e2c8397ee4cfb62e7f1ea249e0e
Commit Graph

12886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alexander Morozov d400ac756c Merge pull request #10433 from guoxiuyan/Fix_typo 
Fix a minor typo
 2015-01-28 20:57:35 -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
Derek McGowan 629815b424 Buffer tar file on v2 push 
fixes #10312
fixes #10306

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-01-27 18:11:05 -08:00
Stephen J Day 86aea582b6 Open up v2 http status code checks for put and head checks 
Under certain cases, such as when putting a manifest or check for the existence
of a layer, the status code checks in session_v2.go were too narrow for their
purpose. In the case of putting a manifest, the handler only cares that an
error is not returned. Whether it is a 304 or 202 does not matter, as long as
the server reports success. Having the client only accept specific http codes
inhibits future protocol evolution.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2015-01-27 18:09:53 -08:00
Sven Dowideit de52a1998d Merge pull request #10374 from SvenDowideit/add-ip-range-for-webhooks 
tell users they can what IP range Hub webhooks can come from so they can...
 2015-01-28 11:55:09 +10:00
Liu Hua 71f8b09543 fix a minor typo in daemon/container.go 
Signed-off-by: Liu Hua <sdu.liu@huawei.com>
 2015-01-28 09:54:40 +08:00
James Turnbull 196cdf1450 Merge pull request #10399 from SvenDowideit/add-registry-mirror-doc 
Add the registry mirror document to the menu
 2015-01-27 20:29:25 -05:00
Sven Dowideit 1d04cc513a Add the registry mirror document to the menu 
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2015-01-28 10:47:11 +10:00
Michael Crosby b3402f34b2 Merge pull request #10322 from dmcgowan/v2-manifest-tarsum-cache 
V2 manifest tarsum cache
 2015-01-27 16:40:49 -08:00
Alexander Morozov 667dc58c39 Export DOCKER_GRAPHDRIVER and DOCKER_EXECDRIVER in integration-cli 
This needed for our "small" testing daemon using same config as "big"
testing daemon.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-01-27 16:40:11 -08:00
James Turnbull 3ac5596fe0 Merge pull request #10369 from mcfiredrill/etc-host-typo 
fix /etc/host typo in remote API docs
 2015-01-27 18:35:16 -05:00
James Turnbull b2b284b5cd Merge pull request #10373 from chenhanxiao/docker-build-typo 
docs: fix a typo in docker-build man page
 2015-01-27 18:25:55 -05:00
Alexander Morozov e54d162941 Merge pull request #10371 from jlhawn/fix_build_output_10364 
Fix premature close of build output on pull
 2015-01-27 15:09:17 -08:00
Alexander Morozov 8f7cf87fd9 Merge pull request #10383 from cpuguy83/update_m2dman 
Update go-md2man
 2015-01-27 13:59:58 -08:00
Tibor Vass bb4025c4e2 Merge pull request #10230 from tianon/emptyfs 
Update emptyfs support to work properly if scratch is already an image
 2015-01-27 15:01:42 -05:00
Jessie Frazelle b9650ad40b Merge pull request #10249 from jlhawn/distribution_version_header_10247 
Split API Version header when checking for v2
 2015-01-27 11:48:42 -08:00
Michael Crosby c81fb7fa4a Merge pull request #10197 from vbatts/vbatts-dm_cookie_support 
devicemapper: API for cookie support
 2015-01-27 11:44:03 -08:00
Michael Crosby e04cc93a2c Merge pull request #10113 from imreFitos/master 
docs: remove NAT rule when removing bridge
 2015-01-27 11:22:53 -08:00
Michael Crosby 83bec40e86 Merge pull request #10370 from ashahab-altiscale/9875-apparmor-regression 
Fixes apparmor regression
 2015-01-27 10:46:22 -08:00
Derek McGowan ab589b442d Use layer checksum if calculated during manifest creation 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-01-27 10:21:35 -08:00
Josh Hawn e662775ffb Fix premature close of build output on pull 
The build job will sometimes trigger a pull job when the base image
does not exist. Now that engine jobs properly close their output by default
the pull job would also close the build job's stdout in a cascading close
upon completion of the pull.

This patch corrects this by wrapping the `pull` job's stdout with a
nopCloseWriter which will not close the stdout of the `build` job.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2015-01-27 10:07:01 -08:00
Brian Goff 79e8ca04f5 Update go-md2man 
Update fixes some rendering issues, including improperly escaping '$' in
blocks, and actual parsing of blockcode.

`ID=$(sudo docker run -d fedora /usr/bin/top -b)` was being converted to
`ID=do docker run -d fedora/usr/bin/top -b)`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-01-27 09:33:42 -05:00
Sven Dowideit 6774be62d6 tell users they can what IP range Hub webhooks can come from so they can filter 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)

Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
 2015-01-27 14:58:29 +10:00
Chen Hanxiao dcfa881a7b docs: fix a typo in docker-build man page 
s/Dockefile/Dockerfile

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
 2015-01-27 11:19:02 +08:00
Jessie Frazelle acb8e08296 Merge pull request #10362 from LK4D4/update_libcontainer 
Update libcontainer to 2d3b5af7486f1a4e80a5ed91859d309b4eebf80c
 2015-01-26 17:18:00 -08:00
Jessica Frazelle 6a2c6e971d Move one last exec test :) 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2015-01-26 17:17:08 -08:00
Doug Davis f709da192c Fix docs so WORKDIR mentions it works for COPY and ADD too 
The docs around COPY/ADD already mentioned that it will do a relative
copy/add based on WORKDIR, so that part is already ok.  Just needed to
tweak the WORKDIR section since w/o mentioning COPY/ADD it can be misleading.

Noticed by @phemmer

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-01-26 17:13:44 -08:00
Tony Miller 87d2adf070 fix /etc/host typo in remote API docs 
Signed-off-by: Tony Miller <mcfiredrill@gmail.com>
 2015-01-27 10:12:54 +09:00