Commit Graph

15798 Commits

Author SHA1 Message Date
b1387e7404 Add filter to /images/json docs
Closes #14894

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: a20bf5e61c542fea377345d5318293b44c65cbb5
Component: engine
2015-07-23 05:29:09 -07:00
e87491eb72 Avoid redundant HEAD requests for identical layers on push
pushV2Tag already deduplicates layers, but the scope of this
deduplication is only for a particular tag. If we are pushing all tags
in a repository, we may check layers several times. Fix this by moving
the layersSeen map from the pushV2Tag function to the v2Pusher struct.

In addition to avoiding some useless round-trips, this makes the "docker
push" output less confusing. It formerly could contain many repeated
lines like:

    124e2127157f: Image already exists
    124e2127157f: Image already exists
    ...

Add test coverage based on the "docker push" output: a hash should not
appear multiple times when pushing multiple tags.

Fixes #14873

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 810d3b2642d4a82dc186d6eff8c2e487ee624bc5
Component: engine
2015-07-22 17:54:20 -07:00
c0b55ed08f Merge pull request #14878 from icecrime/14756_golint_on_ci
Enable validate-lint as part of CI
Upstream-commit: 5fdc10239624aa3b623f46af28bf237b0f33299f
Component: engine
2015-07-22 16:32:29 -07:00
6f661b9f5c Merge pull request #14580 from rohitkadam19/patch-1
Update docker_remote_api_v1.17.md
Upstream-commit: a3857cc3799e2a92b92f07842c03b442490f01ab
Component: engine
2015-07-22 19:22:37 -04:00
8cd4fb4243 Merge pull request #14638 from jfrazelle/new-repo-install-script
update install script/docs for new apt and yum repos
Upstream-commit: f21819275470b8a3ec6915fa59f386be44371356
Component: engine
2015-07-22 15:25:27 -07:00
c56f8c4097 Enable validate-lint as part of CI
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: bc8b8e03b48bf1ef6ce6b67271948e4a20c2ed31
Component: engine
2015-07-22 15:23:34 -07:00
e804755952 Merge pull request #14862 from vdemeester/validate-lint-all-files
Update validate-lint to lint all go files
Upstream-commit: 3198e76b7758ece76600562d960cb17ad735c7ca
Component: engine
2015-07-22 15:18:02 -07:00
54ba2b1bf3 update install script for new repos
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 451d3f5950b493029000c2554fe3f266ffb007e4
Component: engine
2015-07-22 15:08:19 -07:00
56865b2a68 update docs for new install script
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 877d740d4837c67030458254db80aea3869989b1
Component: engine
2015-07-22 15:08:14 -07:00
9ac27d43a3 Merge pull request #13900 from duglin/Deprecate
Define Docker's deprecation policy
Upstream-commit: a628155a7211041b9e671980ead195ddc6e63c6b
Component: engine
2015-07-22 23:23:37 +02:00
bdf2ee5403 Update validate-lint to lint all go files
By default, using go with package will only validate the go file for the
current platform (or at last misses file_windows.go for example). This
tries to fix that.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: fa34f07ec04e22b2e0631cc0656ba569b453d21c
Component: engine
2015-07-22 23:21:18 +02:00
4b6852a08a Merge pull request #14839 from jfrazelle/better-io-error
better i/o timeout error on pull
Upstream-commit: f82ebe5932c24e0062ebe3ef0ea4c1f319cdc544
Component: engine
2015-07-22 14:10:50 -07:00
4ecc8c2651 Define Docker's deprecation policy
Announce the cmd line options that are targetted for removal

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 27b828c9e4430e432380bae4962a366c22228823
Component: engine
2015-07-22 14:09:49 -07:00
4c0710e3a5 Merge pull request #14528 from estesp/add-readme-links
Add links and correct locations in project/README.md
Upstream-commit: 4160d1af7d36e8ce37e6a4acc0e0e3920577521f
Component: engine
2015-07-22 23:05:32 +02:00
76ec388f40 Merge pull request #14864 from ewindisch/apparmor-engine-policy
Add AppArmor policy for the docker binary
Upstream-commit: a7d84503128720612022d46f5c9c04602cb19f05
Component: engine
2015-07-22 13:56:33 -07:00
9aaecca296 Merge pull request #14872 from jfrazelle/fix-debs-apparmour
update deb dockerfiles
Upstream-commit: 80fec1dbaf59fd8b7ac4578910bba3b9ab9d8548
Component: engine
2015-07-22 13:35:24 -07:00
8a3dfa5be3 Add links and correct locations in project/README.md
After removing the duplicate ROADMAP in a separate PR, a few other
issues were noted in README.md which are fixed here:
- the directory is project, not hack
- make.sh is no longer in the current dir since hack/ is not project/
  anymore
- MAINTAINERS is no longer here as a markdown file, but is a TOML file
  in the root of the project
- links were added to all files to make it easier to follow from here
  to the appropriate location

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 9055eb0ce48b663013891d35dbd67978930ac0cb
Component: engine
2015-07-22 16:31:12 -04:00
89bfead992 Merge pull request #14869 from calavera/remove_duplicated_cp_handlers_init
Remove duplicated code parsing parameters for the archiving handlers.
Upstream-commit: 3ee7297b7e30b1af0849947132e4f9234ec49a82
Component: engine
2015-07-22 13:25:34 -07:00
992fae5b93 Merge pull request #14613 from stefanberger/nohidevols2
Do not hide user provided network mounts [v2]
Upstream-commit: d106a2ea2ac7e78f0937798fbb7a21ff7fe1532c
Component: engine
2015-07-22 16:24:22 -04:00
0f4c6539ee Merge pull request #14769 from clintonskitson/add_plugindocs_rexray
updated plugin docs to include REX-Ray
Upstream-commit: d3ba2457d92e0aa763723d632ec9ac9048aa66b9
Component: engine
2015-07-22 22:12:41 +02:00
90d69c37a6 Merge pull request #14799 from coolljt0725/docs_fix_devicemapper_default_basesize
Docs: update the devicemapper default basesize from 10G to 100G
Upstream-commit: 933d9f2e0d61345a11f272487a223f4085bb798a
Component: engine
2015-07-22 22:07:38 +02:00
6e935ab7ff actually update deb dockerfiles
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 1fff0a5cc5503ed2af0fd0b9bf775ebd41917a44
Component: engine
2015-07-22 13:06:04 -07:00
c62ee80e04 Merge pull request #14871 from jfrazelle/change-leeroy-uri
move leeroy under docker
Upstream-commit: 53fb4d6fb62d5c4803bb6d4860587e39b28ee614
Component: engine
2015-07-22 13:03:22 -07:00
a546b6c6c4 move leeroy under docker
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 9bc502ecdef3175cf9141d93ddeb12c92bd7dc06
Component: engine
2015-07-22 12:57:13 -07:00
3a0a990d94 Merge pull request #14067 from vbatts/vbatts-tar-split
graph: layer tar disassembly and reassembly
Upstream-commit: 1639288b0a686f30f4c73486590b1c93d61b9f28
Component: engine
2015-07-22 12:53:26 -07:00
792828f992 Merge pull request #14628 from estesp/update-docker-py
Update docker-py commit to current master (~1.3.1 release)
Upstream-commit: c328e0c8274ab7b988e8c279f447a1074e3b0631
Component: engine
2015-07-22 12:41:41 -07:00
2cc4c8f45c Remove duplicated code parsing parameters for the archiving handlers.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 1612ff972679cb2ab0f89a831156b23473035f10
Component: engine
2015-07-22 12:39:46 -07:00
ec7391b794 Merge pull request #14442 from cpuguy83/refactor_logdrvier_reader
Refactor log driver reader
Upstream-commit: 1c6fe58efc413b606b6b24e42584ca14be2d1ca8
Component: engine
2015-07-22 11:54:35 -07:00
13f3b7974b Merge pull request #14753 from flavio/zfs-initialization-errors
ZFS driver: raise better errors during init
Upstream-commit: 19ba7f9e236c80d34589d941536ef6fd800bb94e
Component: engine
2015-07-22 14:27:46 -04:00
ae18180fac Add AppArmor policy for the engine
Wraps the engine itself with an AppArmor policy.

This restricts what may be done by applications
we call out to, such as 'xz'.

Significantly, this policy also restricts the policies
to which a container may be spawned into. By default,
users will be able to transition to an unconfined
policy or any policy prefaced with 'docker-'.

Local operators may add new local policies prefaced
with 'docker-' without needing to modify this policy.
Operators choosing to disable privileged containers
will need to modify this policy to remove access
to change_policy to unconfined.

Signed-off-by: Eric Windisch <eric@windisch.us>
Upstream-commit: 39dae54a3f40035b1b7e5ca86c53d05dec832ed2
Component: engine
2015-07-22 14:20:50 -04:00
b066063905 Merge pull request #14699 from estesp/docker-ps-format
Carry #10255: Docker ps format
Upstream-commit: 40b922418cd48f8b414d8e10fdd72ed2095697e1
Component: engine
2015-07-22 10:58:34 -07:00
472987774a Do not hide user provided network mounts [v2]
Prevent the docker daemon from mounting the created network files over
those provided by the user via -v command line option. This would otherwise
hide the one provide by the user.
The benefit of this is that a user can provide these network files using the
-v command line option and place them in a size-limited filesystem.

Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
Upstream-commit: 6bd389b9db38eaf4ce2b9cc0cf5024f8450504ef
Component: engine
2015-07-22 13:44:21 -04:00
1ec6bf08bd Update docker-py to current master (~docker-py 1.3.1)
The docker-py commit used in the standard `Dockerfile` is from Feb. 2015
and is out of date with the current API level and has fixes for things
like the new docker cli config location and registry v2 changes/API
responses as well.

Also pass "NOT_ON_HOST=true" to docker-py test suite so that tests
relying on direct HOST interaction (versus running in a container) are
skipped.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 65fb04228eba7c6d8640bc8de8800ade05efe2f1
Component: engine
2015-07-22 13:17:59 -04:00
24e8ba57a5 Merge pull request #14858 from icecrime/14756_update_linted_packages
Update linted package list
Upstream-commit: fe68ac806b887afda31bbdbd8e069f697f7fa76f
Component: engine
2015-07-22 10:11:51 -07:00
e60763fbc1 ps --format: Add config.js doc, fix gofmt, add integration tests
Re-add the docs from @calavera's PR to the moved cli cmd reference docs.
Fix gofmt and vet issues from carried commits
Add integration test for using format with --no-trunc and multi-names
Fix custom_test map order dependency on expected value check
Add docs to reference/commandline/ps.md
Remove "-F" flag option from original carried PR content

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 542b58d8f7a2ff3b78a71b7d2c3145dd79f1fa97
Component: engine
2015-07-22 12:51:16 -04:00
6fe7577ea8 Merge pull request #14217 from ankushagarwal/ubuntu-15.04
Add support for 15.04, add systemd note for 15.04
Upstream-commit: 7d8859a4f54ce86b368860890f9167b910827023
Component: engine
2015-07-22 08:56:02 -07:00
596da1de67 Update linted package list
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: b7184f857489bee6b547eb10a3dfefcd3e420767
Component: engine
2015-07-22 08:46:42 -07:00
9fcd71bb97 graph: isolate the (dis)assembly logic
with the current duplication of code in the grap.go split-up, this puts
all assembly/disassembly logic into isolated functions

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 22347fdb636c0b7936c87f6cf422a2e4a30adf9e
Component: engine
2015-07-22 11:36:15 -04:00
bef6397e67 graph: use tar archive entries for TarLayer
if there is a tar-data.json.gz present for an image layer, then use it
to create the tar archive, instead of the traditional graphdriver Diff.

Signed-off-by: Vincent Batts <vbatts@redhat.com>

Conflicts:
	graph/graph.go
Upstream-commit: 5a00326d29efb161826ef13dfd63ed2732017cd1
Component: engine
2015-07-22 11:36:15 -04:00
3f77e8bf68 graph: variablize file names
and add a comment.. :-)

Signed-off-by: Vincent Batts <vbatts@redhat.com>

Conflicts:
	graph/graph.go
Upstream-commit: ba1f76cbfa2c137abfbc607725460e376e6f44d3
Component: engine
2015-07-22 11:36:15 -04:00
910418adbc graph: preserve tar archive entries
Preserve the entries from the tar archive for layers added to the graph.

With these entries and relative filesystem path, the tar archives can be
reassembled later.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 5d9f06599c4f0cde9ad266dff77e797ea99c3ac3
Component: engine
2015-07-22 11:36:15 -04:00
051476e67d vendor: adding tar-split dependency for graph
tar-split is a facility to disassemble and reassemble tar archives

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 7fb061832a0ebf197abb41c576887a1d2aca18be
Component: engine
2015-07-22 11:36:10 -04:00
50e8a78638 Merge pull request #14851 from bfirsh/golint-integration-cli
Golint integration-cli
Upstream-commit: 875fffdff886205d096ab348d94b5079885f17fb
Component: engine
2015-07-22 11:28:19 -04:00
9ac57ffd87 Merge pull request #14790 from hqhq/hq_golint_build
Fix golint warnings for builder
Upstream-commit: a751c0a52fa5c845631db8de285f4c0a809580bb
Component: engine
2015-07-22 08:17:04 -07:00
4c6f54e228 Merge pull request #14817 from runcom/golint-pkg-mount
pkg: mount: golint
Upstream-commit: f0d0a52d8029f573c03a5b462b9aedf266b5fdb1
Component: engine
2015-07-22 09:23:26 -04:00
d251982e99 Merge pull request #14802 from rhatdan/error
If a user hits this error it would be helpful to know tagstore name.
Upstream-commit: a10cb08bbbb60ffa8b83ff919a9d7ea68bf222e0
Component: engine
2015-07-22 06:17:38 -07:00
6aa4de764e Fix golint warnings for integration-cli
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 6b3c928140193f911b73f87bb8b07f54bba5a63a
Component: engine
2015-07-22 14:03:50 +01:00
c3fd270a2c Merge branch 'master' of github.com:docker/docker into error
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 4815fdc334c5b479095b3d16657b2321ef76cb0c
Component: engine
2015-07-22 08:06:19 -04:00
4df93cb58f Fix wrong Content-Type returned by /images/search API
/images/search was replying with Content-Type text/plain instead
of application/json.
Fix #14846

Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 1a5d6a94c9e4c099354d9125ea857f6277eca0b7
Component: engine
2015-07-22 11:07:41 +02:00
e1e5cbd789 pkg: mount: golint
Fix the following warnings:

pkg/mount/mountinfo.go:5:6: type name will be used as mount.MountInfo by other packages, and that stutters; consider calling this Info
pkg/mount/mountinfo.go:7:2: struct field Id should be ID

Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 0f5c9d301b9b1cca66b3ea0f9dec3b5317d3686d
Component: engine
2015-07-22 10:26:10 +02:00