Commit Graph

12873 Commits

Author SHA1 Message Date
Arnaud Porterie 30a16b5689 Add some push test coverage
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: dbec2317e503b8a0190102332168f9d0256392b7
Component: engine
2015-01-15 14:05:06 -08:00
Alexander Morozov ffe79c46c9 Tests for push to registry v2
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: f138f7bd50a1c5a435f3146f0b0298a2a4e260ce
Component: engine
2015-01-15 14:05:06 -08:00
Alexander Morozov cf62cf0f1e RegistryV2 datastructure for tests
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 2fc2862a73dbbc612f59f61f66c465d2e48bcbea
Component: engine
2015-01-15 14:05:06 -08:00
Alexander Morozov 429cac7027 Install registry V2 in image
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: ef96c28754706da921644e5cf9202f9cc78d4c7e
Component: engine
2015-01-15 14:05:06 -08:00
Derek McGowan 5cfb6b6d7e Fix integration test failures
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 9a38aa0279ccae5aeded854a9cbbd7e398088ab2
Component: engine
2015-01-15 14:05:06 -08:00
Derek McGowan e05bd85386 Fix list tags
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 1a9cdb13943c6af397472e235708cb10824681cd
Component: engine
2015-01-15 14:05:06 -08:00
Derek McGowan dce0c9eeca Update push to sign with the daemon's key when no manifest is given
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 8ceb9d20d66097b90ca3a529da258669ef6b8412
Component: engine
2015-01-15 14:05:06 -08:00
Derek McGowan 07ca876ccc Refactor from feedback
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 25945a40c4f352a754cbd8dba9c846c7539fe463
Component: engine
2015-01-15 14:05:06 -08:00
Josh Hawn c13d2851b8 Add Tarsum Calculation during v2 Pull operation
While the v2 pull operation is writing the body of the layer blob to disk
it now computes the tarsum checksum of the archive before extracting it to
the backend storage driver. If the checksum does not match that from the
image manifest an error is raised.

Also adds more debug logging to the pull operation and fixes existing test
cases which were failing. Adds a reverse lookup constructor to the tarsum
package so that you can get a tarsum object using a checksum label.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 213e3d116642431adbe634d39740eddc5a81e063
Component: engine
2015-01-15 14:05:05 -08:00
Derek McGowan 2a0f9941dc Fix tests
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Upstream-commit: 7eeda3f14de744b98b1c5aca4f2ecce87a479baa
Component: engine
2015-01-15 14:05:05 -08:00
Stephen J Day 56c1f6c9e6 Correctly check and propagate errors in v2 session
Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 1b43144ad8597d0d0ca089042c1162ba668259ab
Component: engine
2015-01-15 14:05:05 -08:00
Derek McGowan 445a293eb7 Get token on each request
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Upstream-commit: d094eb6f7ffe6b608ecde54297e107e5caa0954d
Component: engine
2015-01-15 14:05:05 -08:00
Derek McGowan 21c36fbac8 Allow private V2 registry endpoints
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Upstream-commit: 7d61255f578bae7dc5c2a5d44c50bf32bbc9f568
Component: engine
2015-01-15 14:05:05 -08:00
Derek McGowan bd2dadaee1 Update push and pull to registry 2.1 specification
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Upstream-commit: 0336b0cdaa74ac03003c4a933eb866fb0cec8125
Component: engine
2015-01-15 14:05:05 -08:00
Stephen J Day 93ab6ab93d Remove dependencies on registry packages
Because docker core cannot vendor non-master Go dependencies, we need to remove
dependencies on registry package. The definition of digest.Digest has been
changed to a string and the regular expressions have been ported from
docker-registry/common library.

We'll likely change this be dependent on the registry in the future when the
API stabilizies and use of the master branch becomes the norm.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: dbb4b03bfc82eadefaf68c1a81d215949980550e
Component: engine
2015-01-15 14:05:05 -08:00
Stephen J Day d8303cd325 Registry V2 HTTP route and error code definitions
This package, ported from next-generation docker regsitry, includes route and
error definitions. These facilitate compliant V2 client implementation. The
portions of the HTTP API that are included in this package are considered to be
locked down and should only be changed through a careful change proposal.
Descriptor definitions package layout may change without affecting API behavior
until the exported Go API is ready to be locked down.

When the new registry stabilizes and becomes the master branch, this package
can be vendored from the registry.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: a0f92a26d90e870dfddae9694a5de97e36d3f586
Component: engine
2015-01-15 14:05:05 -08:00
Josh Hawn 0d8e8d5acb Update token response handling
Registry authorization token is now taken from the response body rather than
the repsonse header.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: e23362597dcaa8839271210d24bda2ba55f1e12f
Component: engine
2015-01-15 14:05:05 -08:00
Derek McGowan 6614616033 Update push to use mount blob endpoint
Using mount blob prevents repushing images which have already been uploaded

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: e9b590d85e9c622316b8be71004737f63e6b9503
Component: engine
2015-01-15 14:05:05 -08:00
Derek McGowan eaeb1f3166 Use tarsum dev version to fix mtime issue
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 3e4fd005449448ab85c917a5d27ca584b260309c
Component: engine
2015-01-15 14:05:05 -08:00
Derek McGowan 321425170a Update manifest format for push
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: bcc0a343bb9c75443238e614e4c2da5f707aef8d
Component: engine
2015-01-15 14:05:05 -08:00
Derek McGowan 6a46693a7d Push flow
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 188b56c836e49e3c888e1e27e4e26b5cc0f1caaa
Component: engine
2015-01-15 14:05:05 -08:00
Derek McGowan c07ed3a544 Add trust key creation on client
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: ac8d964b28f23c9790102462a040054e7857cb26
Component: engine
2015-01-15 14:04:14 -08:00
Josh Hawn e89bb2e57b Adds support for v2 registry login
summary of changes:

registry/auth.go
  - More logging around the login functions
  - split Login() out to handle different code paths for v1 (unchanged logic)
    and v2 (does not currently do account creation)
  - handling for either basic or token based login attempts
registry/authchallenge.go
  - New File
  - credit to Brian Bland <brian.bland@docker.com> (github: BrianBland)
  - handles parsing of WWW-Authenticate response headers
registry/endpoint.go
  - EVEN MOAR LOGGING
  - Many edits throught to make the coad less dense. Sparse code is more
    readable code.
  - slit Ping() out to handle different code paths for v1 (unchanged logic)
    and v2.
  - Updated Endpoint struct type to include an entry for authorization
    challenges discovered during ping of a v2 registry.
  - If registry endpoint version is unknown, v2 code path is first attempted,
    then fallback to v1 upon failure.
registry/service.go
  - STILL MOAR LOGGING
  - simplified the logic around starting the 'auth' job.
registry/session.go
  - updated use of a registry.Endpoint struct field.
registry/token.go
  - New File
  - Handles getting token from the parameters of a token auth challenge.
  - Modified from function written by Brian Bland (see above credit).
registry/types.go
  - Removed 'DefaultAPIVersion' in lieu of 'APIVersionUnknown = 0'`

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 41e20cecb9944137de82ff5fa0898f953aa2bf87
Component: engine
2015-01-15 14:04:14 -08:00
Doug Davis 6d8927db75 Build CMD/ENTRYPOINT cache strings properly
Make sure that as we build the CMD/ENTRYPOINT cache strings that we don't
treat ["echo","hi"] and ["echo hi"] as the same thing due to the fact that
we're just doing a strcat on the array.

Closes #10097

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 88905793add88c8d5ff93f0e9b1edca5f012da33
Component: engine
2015-01-15 12:49:30 -08:00
Doug Davis 468fbf0066 Add the list of possible values for --log-level to help text
Closes #10034

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: ed13110e88846694a675696c161ce6456402f3ef
Component: engine
2015-01-15 12:20:41 -08:00
Srini Brahmaroutu 9976dfdd89 Env Variables created for each of the ports in addition to env variables for port ranges, regression from #1834
Closes #9900
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 611a23aa7f443284fbbbb80716c46159e438bf52
Component: engine
2015-01-15 19:16:31 +00:00
Michael Crosby 00273b496a Merge pull request #10109 from ankushagarwal/imagespec-typo
Fix typos in image spec v1
Upstream-commit: 3837c080228143378b1041364a90aa5bcf59fa00
Component: engine
2015-01-15 08:58:29 -08:00
Nathan Hsieh 3b76395570 changed format of cli note
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com>
Upstream-commit: c252d5f3f4fc98062fbda6335a04cca2602a4223
Component: engine
2015-01-15 08:39:16 -08:00
Sebastiaan van Stijn 3abcc54bab Docs: Add note that export doesn't include volume data.
The documentation on `docker export` doesn't mention that
data in volumes is not included in the export.

This adds a note that volumes are not part of the export
and refers to the "Backup, restore, or migrate data volumes"
to give the user some pointers.

Relates to https://github.com/docker/docker/issues/10095

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 67588d0ec4d73a8f2efb150d555c38b7ebfca7f6
Component: engine
2015-01-15 16:54:45 +01:00
HuKeping bfbad06c13 log: Add restart policy name to the inspect information of container
Under the restart policy "--restart=no", there is no record about it
in the information from docker inspect.

To keep it consistent around the three(maybe more in the future) restart
policies and distinguish with no restart policy specified cases, it's
worth to record it even though it is the default restart policy which
will not restart the container.

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 2082ff82b581dfbe252338829c1ce7c31797f66c
Component: engine
2015-01-15 22:40:31 +08:00
Ankush Agarwal 647f575a6c Typo creating -> created
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 82bfb3852ea0835d96d456c256f40633b020bd1e
Component: engine
2015-01-14 23:02:17 -08:00
imre Fitos 7eaeff37c0 docs: remove NAT rule when removing bridge
Signed-off-by: imre Fitos <imre.fitos+github@gmail.com>
Upstream-commit: d10d0e568e44a4e55293610a5cac84359719baff
Component: engine
2015-01-14 23:06:13 -05:00
Jessie Frazelle 14a514f68a Merge pull request #10110 from jfrazelle/fix-vfs-issue
ignore vfs from graphdriver warning
Upstream-commit: ae493e721ee2cee68e06f0c2cc935c3e8de9d428
Component: engine
2015-01-14 19:54:17 -08:00
Sven Dowideit 792af8c0a5 Add build --pull and evenets --filter flags to the docs for 1.4
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 18a2c77435cdad8f759421500cba6ac20057daf8
Component: engine
2015-01-15 15:20:48 +13:00
Nathan Hsieh c72b573e2b added note to man & cli docs on search limit
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com>
Upstream-commit: 92ef40a8260e5e8dcd5579a6f9d942c4e68702ed
Component: engine
2015-01-14 18:03:09 -08:00
Jessica Frazelle 10d8a73193 ignore vfs from warning
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: f88066fd43454be005ec303977ee45561f3436e6
Component: engine
2015-01-14 17:28:50 -08:00
Ankush Agarwal 387cdea261 Typo image -> container
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 034466d356ecc5bc993f255c5ec5fb96e7327b8b
Component: engine
2015-01-14 17:18:11 -08:00
Jessie Frazelle f71acef86e Merge pull request #9881 from tianon/json-array-of-strings
Adjust builder to validate that JSON in Dockerfiles are arrays of strings and nothing else to match how we describe them to people (and what all our existing tests already assumed)
Upstream-commit: 640e0fc578e5acdaa71216a300396dfa9af8054f
Component: engine
2015-01-14 17:13:51 -08:00
Jessie Frazelle e2b5d6afd7 Merge pull request #10108 from tiborvass/carry-9989
[Carry] Fix a panic where RUN [] would be supplied
Upstream-commit: eaecf741f0e00a09782d5bcf16159cc8ea258b67
Component: engine
2015-01-14 17:12:59 -08:00
Michael Crosby 28b575d46d Merge pull request #10106 from icecrime/win_integration_tests
Fix some Windows integration tests
Upstream-commit: c126a2303fccc074f2382d01a2b685a1836cd621
Component: engine
2015-01-14 17:04:49 -08:00
Victor Vieux a22356060c Merge pull request #10107 from jfrazelle/9328-fix-try-start-paused-container
Error should show when trying to start a paused container.
Upstream-commit: 27f69b077703607862afa4a75c929ed07396ac2b
Component: engine
2015-01-14 17:02:23 -08:00
Tibor Vass f2f058e60b builder: use len() > 0 instead of != nil
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 3183af8b19d2adf29dd3fb80689d764353a3fe00
Component: engine
2015-01-14 16:55:56 -08:00
Erik Hollensbe 869bebb91c Fix a panic where RUN [] would be supplied.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 39343b86182b4e997dc991645729ae130bd0f5f2
Component: engine
2015-01-14 16:55:56 -08:00
Jessica Frazelle 11776a4f9e Error should show when trying to start a paused container.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 02246d2d9f9fe8eb040d1eb1ac4b7a84c3f3f059
Component: engine
2015-01-14 16:49:08 -08:00
Arnaud Porterie 7467fc1bd7 Take DOCKER_TEST_HOST into account
Tests no longer make the assumption that the daemon can be accessed
through unix:///var/run/docker.sock.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: e1ef33449f484678d236cb49e80daf5ba1e1899c
Component: engine
2015-01-14 16:14:27 -08:00
Alexander Morozov 2a3eb3ae39 Merge pull request #10093 from crosbymichael/readonly-containers
Add --read-only for read only container rootfs
Upstream-commit: 95c0f07966035ce79c6b51a2eee8c60c59fb523c
Component: engine
2015-01-14 15:56:51 -08:00
Michael Crosby 2ef8faf6e3 Add --readonly for read only container rootfs
Add a --readonly flag to allow the container's root filesystem to be
mounted as readonly.  This can be used in combination with volumes to
force a container's process to only write to locations that will be
persisted.  This is useful in many cases where the admin controls where
they would like developers to write files and error on any other
locations.

Closes #7923
Closes #8752

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 409407091a7282d0c4086b71e86397e2d089ba13
Component: engine
2015-01-14 15:41:31 -08:00
Michael Crosby d149e702e3 Merge pull request #10101 from LK4D4/fix_vet_errors
Fix vet errors
Upstream-commit: 3118ccc6bcd2a2d63700584dc1ce2dbb0a65cbb6
Component: engine
2015-01-14 15:18:20 -08:00
Michael Crosby 403c558154 Merge pull request #10102 from jfrazelle/windows-fix
Add build constraint for windows
Upstream-commit: 73bf350d3d538780b2b3fbeb207369544f36fdd1
Component: engine
2015-01-14 15:15:46 -08:00
Jessica Frazelle 8d01a3ebdf Add build constraint.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 798215af24953f5e3dcacb08965f3714b2fd903f
Component: engine
2015-01-14 14:40:07 -08:00