docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,318 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

2318 Commits

Author SHA1 Message Date
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
Victor Vieux 67a4d559db Merge pull request #1449 from jimenez/mesos_user_abnormal_error 
Improving error output for bad swarm mesos user
 2015-12-07 13:43:34 -08:00
Victor Vieux d9265c4f21 Merge pull request #1501 from abronan/modify_default_ttl_heartbeat 
Increase default TTL and heartbeat value
 2015-12-07 13:22:25 -08:00
Morgan Bauer 19369febf4 Merge pull request #1509 from MHBauer/maintainers 
Add @mhbauer to maintainers
 2015-12-07 12:56:26 -08:00
Morgan Bauer 0e8763920e
Add @mhbauer to maintainers 
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2015-12-07 11:14:52 -08:00
Alexandre Beslic 0b0e328b7b Merge pull request #1472 from abronan/improve_docs_duplicate_engine_ids 
Add clarification on install for VM cloning and Engine ID duplication issue
 2015-12-06 21:39:37 -08:00
Alexandre Beslic 75a3ac2c7f add clarification on install for VM cloning and Engine ID duplication problem 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-12-06 21:27:37 -08:00
moxiegirl 63ba877cff Merge pull request #1506 from thaJeztah/fix-readme-links 
Fix broken links in discovery README
 2015-12-06 20:49:29 -08:00
Sebastiaan van Stijn fe0a2a9427 Fix broken links in discovery README 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-12-07 00:43:17 +01:00
Alexandre Beslic 3048dc996d Merge pull request #1497 from vieux/emphasis_token_not_prod 
emphasize the hosted discovery service is not meant for production
 2015-12-06 01:16:22 -08:00
Alexandre Beslic 501b9609dd fix typos and add note in discovery README for token usage scenarios 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-12-06 01:04:30 -08:00
Alexandre Beslic f21efa4337 Increase default TTL and heartbeat value 
Increases the default ttl and heartbeat value for discovery.
Because the node will still be listed for a long period on
`docker info`, there is now a Status to know if a node is
in the healthy or unhealthy state.

Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-12-04 17:11:33 -08:00
Victor Vieux f78c8054b7 Merge pull request #1498 from vieux/default_aufs 
default back to aufs
 2015-12-04 16:10:10 -08:00
Alexandre Beslic 4581e65432 Merge pull request #1438 from dongluochen/networkId 
Route network connect/disconnect request to the right engine.
 2015-12-04 16:03:54 -08:00
Sven Dowideit b1d621c286 Merge pull request #1493 from SvenDowideit/linkchecker-fixes 
Small fixes found by linkchecker
 2015-12-05 09:31:09 +10:00
Victor Vieux 765431f70f emphasize the hosted discovery service is not meant for production 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-12-04 15:22:30 -08:00
Victor Vieux 8111304a52 Merge pull request #1496 from thaJeztah/update-maintainers 
update maintainers file for parsing
 2015-12-04 15:06:05 -08:00
Sebastiaan van Stijn 2360ffe0dd update maintainers file for parsing 
this updates the MAINTAINERS file to the new format,
so that it can be parsed and collected in the docker/opensource
repository.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-12-04 16:27:15 +01:00
Andrea Luzzardi 6aa6f76f3e Merge pull request #1463 from cpuguy83/1430_tls_closewrite 
Ensure CloseWrite is called for hijacked TLS conns
 2015-12-03 19:51:19 -08:00
Brian Goff c57c8a329e Ensure CloseWrite is called for hijacked TLS conns 
Golang's `*tls.Conn` does not support `CloseWrite`, this means that
connections using TLS will not be able to properly close on hijacked
connections.

This copies Go's tls.Dial and instead returns an internal
`tlsClientConn` type that does store the raw net.Conn and implements
`CloseWrite`.
Implementation is mostly copied from
`github.com/docker/docker/api/client/hijack.go`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-12-03 22:48:28 -05:00
Andrea Luzzardi 9386efdfb1 Merge pull request #1425 from jimmyxian/set-memory-wappiness-default-value 
set MemorySwappiness default value
 2015-12-03 19:36:06 -08:00
Xian Chaobo 63498b1a80 set MemorySwappiness default value 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-12-04 09:25:32 +08:00
Xian Chaobo 0bd250bcf0 Merge pull request #1494 from dongluochen/clientUpdate 
Godep update github.com/samalba/dockerclient
 2015-12-04 09:15:27 +08:00
Dong Chen 9df95842a9 Godep update github.com/samalba/dockerclient. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2015-12-03 10:28:48 -08:00
Sven Dowideit 925ac57d6c Small fixes found by linkchecker 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-12-03 21:38:37 +10:00
Alexandre Beslic ed0b11e506 Merge pull request #1490 from jimmyxian/fix-retry-time 
Fix retry time when check disconnect events
 2015-12-03 01:02:06 -08:00
Xian Chaobo 19c0c0e6f9 integration: fix retry time when check disconnect events 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-12-03 16:53:24 +08:00
Xian Chaobo 913073ff5f Merge pull request #1489 from abronan/fix_ci_kernel_memory 
Integration: fix --kernel-memory value set too low
 2015-12-03 16:48:24 +08:00
Alexandre Beslic 44d96a6185 integration: fix --kernel-memory value set too low 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-12-03 00:28:00 -08:00
Victor Vieux f73ec80548 default back to aufs 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-12-02 20:45:15 -08:00
Dong Chen 10986a6038 Use ioutil.NopCloser to make copy of http.request.Body. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2015-12-02 18:46:16 -08:00
Dong Chen 22ff794c2e Route network connect/disconnect request to the right engine. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2015-12-02 18:46:16 -08:00
Victor Vieux 7ba5bc7ab0 Merge pull request #1476 from jimenez/zk_tests 
Zk tests
 2015-12-01 23:59:24 -08:00
Isabel Jimenez a250ded715 Adding zk tests for swarm-mesos integration 
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
 2015-12-02 02:40:09 -05:00
Isabel Jimenez c86de629a8 godep update 
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
 2015-12-02 02:39:09 -05:00
Victor Vieux 5fe196d61f Merge pull request #1445 from dnephin/doc_filter_includes_stopped 
Update filter docs
 2015-12-01 18:13:42 -08:00
Daniel Nephin f432b63fe3 Updates to swarm filters documentation 
Support reloading of docs.

Adjust the titles in docs/scheduler.filter to be more descriptive.

Also moves the meta sections about constraints out from the container affinity section.

Add a note about stopped containers being used by filters to the docs.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-12-01 17:49:25 -08:00
Alexandre Beslic 4fdcd3f903 Merge pull request #1477 from vieux/update_compose_1.5.1 
update compose to 1.5.1
 2015-12-01 17:38:59 -08:00
Victor Vieux d295d4b323 update compose to 1.5.1 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-12-01 02:27:50 -08:00
Victor Vieux f5d21c19db Merge pull request #1465 from mountkin/fix-1436 
fix the panic when "ps -a" with dead containers
 2015-11-30 14:54:47 -08:00
Victor Vieux de6383c4dd Merge pull request #1448 from jimenez/timeout_default 
Changing offers timeout default to prevent other frameworks starvation
 2015-11-30 14:35:09 -08:00
Victor Vieux b7ca0e7844 Merge pull request #1450 from jimenez/glog_enable 
Enabling glog for mesos
 2015-11-30 13:40:06 -08:00
Shijiang Wei 3f6182c384 fix the panic when "ps -a" with dead containers 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
 2015-11-30 22:16:43 +08:00
Alexandre Beslic d05c80c1ae Merge pull request #1459 from sandric/patch-1 
Update networking.md
 2015-11-29 01:25:50 -08:00
sandric f7e02d64ae Update networking.md 
Fix typos

Signed-off-by: sandric <kyrychenkoanton@gmail.com>
 2015-11-28 07:48:29 +02:00
Alexandre Beslic 2b1d392b8c Merge pull request #1454 from SvenDowideit/move-to-docs-base-latest 
Use FROM docs/base:latest again
 2015-11-26 15:49:36 -08:00
Alexandre Beslic 56e90a56dc Merge pull request #1453 from jimmyxian/fix-integration-test 
Fix CI
 2015-11-25 19:07:46 -08:00
Sven Dowideit b0705e56ee Use FROM docs/base:latest again 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-11-26 12:56:23 +10:00
Xian Chaobo b85c2a65c6 fix CI 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-11-26 10:49:08 +08:00