1
0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
moxiegirl
34e38312bf Merge pull request #18438 from bfirsh/update-getting-started-in-readme
Link getting started in readme to installation instructions
2015-12-12 21:29:26 -08:00
Mary Anthony
f1fb2722a1 Chaning User guide to overview close #1483
Signed-off-by: Mary Anthony <mary@docker.com>
2015-12-12 21:22:17 -08:00
Jeff Johnston
a77861bca7 Update configuring Docker article
Signed-off-by: Jeff Johnston <jeff.johnston.mn@gmail.com>
2015-12-12 20:36:48 -06:00
Jeffrey Morgan
94f7ce8b71 Fix bug where renaming or editing container settings would cause volume settings to be lost
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-12-12 17:38:54 -08:00
Sebastiaan van Stijn
51ffc088a5 Merge pull request #18270 from hqhq/hq_refactor_verify_config
Move verify container resources to a separate function
2015-12-12 12:47:19 +01:00
Antonio Murdaca
1fffc0270f Merge pull request #15365 from twistlock/14674-docker-authz
Docker authorization plug-in infrastructure
2015-12-12 12:30:33 +01:00
Antonio Murdaca
241f6d7107 Merge pull request #18592 from hqhq/hq_fix_start
Add lock for container update
2015-12-12 12:17:18 +01:00
Daniel Nephin
920ea13516 Refactor ResolveAuthConfig to remove the builder dependency on cli code.
registry.ResolveAuthConfig() only needs the AuthConfigs from the ConfigFile, so
this change passed just the AuthConfigs.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-12-11 19:31:24 -08:00
Daniel Hiltgen
dde577d154 Add token pass-thru for Authconfig
This augments the CreateContainer call to detect the AuthConfig header
and use any supplied auth for pull operations.  This will allow pulling
of protected image on to specific node during the create operation.

CLI usage example using username/password:

    # Calculate the header
    REPO_USER=yourusername
    read -s PASSWORD
    HEADER=$(echo "{\"username\":\"${REPO_USER}\",\"password\":\"${PASSWORD}\"}"|base64 -w 0 )
    unset PASSWORD
    echo HEADER=$HEADER

    # Then add the following to your ~/.docker/config.json
    "HttpHeaders": {
        "X-Registry-Auth": "<HEADER string from above>"
    }

    # Now run a private image against swarm:
    docker run --rm -it yourprivateimage:latest

CLI usage example using registry tokens: (Required engine 1.10 with new auth token support)

    REPO=yourrepo/yourimage
    REPO_USER=yourusername
    read -s PASSWORD
    AUTH_URL=https://auth.docker.io/token
    TOKEN=$(curl -s -u "${REPO_USER}:${PASSWORD}" "${AUTH_URL}?scope=repository:${REPO}:pull&service=registry.docker.io" |
        jq -r ".token")
    HEADER=$(echo "{\"registrytoken\":\"${TOKEN}\"}"|base64 -w 0 )
    echo HEADER=$HEADER

    # Update the docker config as above, but the token will expire quickly...

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2015-12-11 18:36:55 -08:00
Daniel Hiltgen
f0b785a206 Vendor bump of dockerclient
This adds the new auth client token support.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2015-12-11 18:36:55 -08:00
Nathan LeClaire
60ec6dc1a1 Add docs polish for 0.5.3 release
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-12-11 18:19:23 -08:00
Alexandre Beslic
d3affe5904 Merge pull request #1535 from vieux/prevent_panic_no_name
prevent panic in filters when container has no name
2015-12-11 17:50:08 -08:00
Ying Li
c0bf1a4a68 Fix semantic merge conflict.
Signed-off-by: Ying Li <ying.li@docker.com>
2015-12-11 17:37:29 -08:00
Nathan LeClaire
d29a42ebc6 Merge pull request #1299 from hairyhenderson/ssh-agent-support-1291
Allowing generic driver to use ssh-agent to get identities
2015-12-11 17:31:55 -08:00
Nathan LeClaire
1d98b690be Strip certs and keys in log before sending to Bugsnag
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-12-11 16:56:19 -08:00
Nathan LeClaire
104b04d3de Merge pull request #2556 from jeanlaurent/use-bundled-key
Use bundled bugsnag APIKey
2015-12-11 16:50:37 -08:00
Sebastiaan van Stijn
129c9a22f7 Fix headers in documentation
These headers were rendered as body text
because there was no space, but a "tab" after
the `#`.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-12 01:39:51 +01:00
Diogo Monica
fd01151cd2 Adding a volume to MYSQL to ensure data persistence
Signed-off-by: Diogo Monica <diogo@docker.com>
2015-12-11 16:37:54 -08:00
David Lawrence
8bca542c17 restructuring validateUpdate to get rid of prepRepo
removing attempt in server/snapshot/snapshot.go to regenerate
metadata for roles in snapshot.

Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
2015-12-11 16:20:20 -08:00
David Lawrence
4aa9239aaf Merge pull request #335 from cyli/client-snapshot
Client supports server snapshot
2015-12-11 16:04:29 -08:00
David Calavera
229d3bace8 Move client version to the docker cli.
This removes the dockerversion dependency from the client library.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-11 19:03:33 -05:00
Victor Vieux
47d63f9b72 Merge pull request #1532 from jimenez/integration_tests
Adding integration tests for mesos
2015-12-11 15:56:34 -08:00
Sebastiaan van Stijn
8d36f097cf Merge pull request #18613 from calavera/flack_streaming_events_test
Log events stream when TestEventStreaming fails.
2015-12-12 00:40:25 +01:00
Dongluo Chen
982c568991 Merge pull request #1523 from vieux/release_checklist
add RELEASE-CHECKLIST.md
2015-12-11 15:25:25 -08:00
Aaron Lehmann
be1f4114c7 Remove unnecessary stat from blob Get method
This calls Stat before Open, which should be unnecessary because Open
can handle the case of a nonexistent blob. Removing the Stat saves a
round trip.

This is similar to the removal of stat in Open in #1226.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-12-11 15:13:03 -08:00
Sebastiaan van Stijn
83d0a86470 Merge pull request #18608 from calavera/rename_get_to_get_container
Rename `Daemon.Get` to `Daemon.GetContainer`.
2015-12-12 00:10:42 +01:00
David Lawrence
03aa3509bd fixing bugs raised by @mtrmac
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
2015-12-11 15:06:24 -08:00
Ying Li
9d2590ffb5 Only allow publishing if there is no snapshot.json, not if it's corrupt
or unreadable.

This also modifies tuf/store/filestore to return ErrMetaNotFound if the
metadata file does not exist.

Signed-off-by: Ying Li <ying.li@docker.com>
2015-12-11 15:04:08 -08:00
Daniel Nephin
a1217dc050 Merge pull request #2536 from dbonev/2345-incorrect-network-name
Incorrect network name shown in the log when no driver is specified
2015-12-11 14:39:36 -08:00
David Calavera
a3056f9f72 Log events stream when TestEventStreaming fails.
Let the tag event some more time to be emitted.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-11 17:20:40 -05:00
David Calavera
91799c232e Merge pull request #18610 from runcom/fix-warn
api: client: info: add newline after warning
2015-12-11 13:41:14 -08:00
Isabel Jimenez
70a2713c60 Adding integration tests for mesos
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2015-12-11 16:14:49 -05:00
Sebastiaan van Stijn
a84982a9c7 Merge pull request #18591 from calavera/inspector_tests
Make sure template inspector always prints a carriage return.
2015-12-11 22:03:42 +01:00
Ying Li
f3f8de50d1 Clarified the default_alias configuration for Notary Signer.
Also changed the on-container paths for the server/signer configuration
to be /etc/docker/notary-(signer|server).

Signed-off-by: Ying Li <ying.li@docker.com>
2015-12-11 12:26:48 -08:00
Ying Li
54c7de5bd6 Update the server and signer docs to reflect new code changes.
Signed-off-by: Ying Li <ying.li@docker.com>
2015-12-11 12:26:48 -08:00
Ying Li
4d696a0187 Grammar/spelling/formatting/readability fixes.
Signed-off-by: Ying Li <ying.li@docker.com>
2015-12-11 12:26:48 -08:00
Ying Li
7ee1173084 Add information on how to run notary-signer.
Signed-off-by: Ying Li <ying.li@docker.com>
2015-12-11 12:26:48 -08:00
Ying Li
2e8721564d Added documentation for the notary signer configuration file.
Signed-off-by: Ying Li <ying.li@docker.com>
2015-12-11 12:26:48 -08:00
Ying Li
e9d0e68b97 Add information on how to run notary-server from a docker image.
Also include information on how to override the configuration file
in the docker image.

Signed-off-by: Ying Li <ying.li@docker.com>
2015-12-11 12:26:48 -08:00
Ying Li
ca54b435ce Add documentation for notary server (what it does, etc.).
Signed-off-by: Ying Li <ying.li@docker.com>
2015-12-11 12:26:48 -08:00
Ying Li
41b1d57b95 Document the notary-server configuration JSON file.
Signed-off-by: Ying Li <ying.li@docker.com>
2015-12-11 12:26:48 -08:00
Ying Li
351f90fa1c Add a script to use openssl to generate root/server/client ssl certs.
Signed-off-by: Ying Li <ying.li@docker.com>
2015-12-11 12:26:48 -08:00
Mrunal Patel
e8f7d5885d Update runc/libcontainer to v0.0.6
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-12-11 15:24:32 -05:00
Antonio Murdaca
bb3d7e1e65 api: client: info: add newline after warning
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-11 20:54:51 +01:00
Diogo Mónica
ec78a03045 Merge pull request #356 from HuKeping/refactor-mainhandler
Refactor a little to reduce indentation
2015-12-11 11:46:26 -08:00
Ying Li
25f22a2dc8 Merge pull request #357 from mtrmac/fix-vet
Fix (make vet)
2015-12-11 11:33:24 -08:00
Alexandre Beslic
f9e4b84a19 Merge pull request #1530 from vieux/handle_engine_unhealthy_in_proxy
return proper error for inspect and proxy on unhealthy node
2015-12-11 11:00:43 -08:00
Miloslav Trmač
da7c87f9dc Fix (make vet)
server/handlers/default_test.go:353: GetCurrent passes Lock by value: handlers.failStore contains github.com/docker/notary/server/storage.MemStorage contains sync.Mutex
tuf/store/httpstore_test.go:208: github.com/docker/notary/tuf/validation.ErrBadRoot composite literal uses unkeyed fields

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2015-12-11 19:59:16 +01:00
Liron Levin
de4ffdfe48 Change authz plugin argument name
Signed-off-by: Liron Levin <liron@twistlock.com>
2015-12-11 20:59:15 +02:00
Victor Vieux
0116fbf3d0 Merge pull request #1531 from ch3lo/fix-typo
fix bracket
2015-12-11 10:37:10 -08:00