Commit Graph

95 Commits

Author SHA1 Message Date
Dongluo Chen b3205ca161 Merge pull request #2288 from nishanttotla/refactoring-img-handling
Refactoring code around image ref generation
2016-06-14 14:34:20 -07:00
NanXiao 5f0e652d29 Edited cluster/cluster.go
Signed-off-by: NanXiao <nan@chinadtrace.org>
2016-06-13 17:47:09 +08:00
allencloud d7241f3682 remove engine details in POST /volumes/create API
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-05-29 15:12:14 +08:00
Nishant Totla e782541d99
Refactoring code around image ref generation
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-05-26 10:37:39 -07:00
Nishant Totla 82f1bfe0ec
Changing relevant function calls for updated engine-api
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-05-25 15:47:06 -07:00
Nishant Totla c70f836e88
Remove type unnecessary type conversion
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-26 13:42:17 -07:00
Nishant Totla 11df80601c
Updating cluster
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-14 09:36:59 -07:00
Nishant Totla 81e1528d0f
Updating API handlers
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-14 09:36:59 -07:00
Victor Vieux 5e13bcf8ff use engine-api for network create
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-25 15:35:04 -07:00
Sun Hongliang 07a47d54a4 fix typos
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-31 13:52:01 +08:00
Morgan Bauer 4516d1ae16
use apiClient for volumes management
- create volume
 - list volumes

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2016-03-29 15:01:27 -07:00
Morgan Bauer 1e22226b71
use apiClient for removing images
- remove unused argument
 - unit test of new client

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2016-03-29 14:50:22 -07:00
Victor Vieux e98cf00409 support private images, labels and other new flags in docker build
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-24 18:27:20 -07:00
Victor Vieux b05dee4d6e HostConfig for /start endpoint
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-14 19:23:57 -07:00
Nishant Totla 6af37c4888 Updating info function to use engine-api
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-09 13:58:50 -08:00
Victor Vieux c42142e408 Revert "Passing HostConfig for /start endpoint"
This reverts commit 6ff0d29c9d.

Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-17 15:46:37 -08:00
Nishant Totla 6ff0d29c9d Passing HostConfig for /start endpoint
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-02-17 11:06:51 -08:00
Isabel Jimenez c809e6a643 Fix double start
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2016-01-31 19:08:48 -05:00
Victor Vieux f3a1027bbe update docker info
add test

Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-27 01:07:52 -08:00
Victor Vieux 1225eddc79 allow engine/name support in volumes
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-16 17:40:53 -08:00
Andrea Luzzardi 56941d02a8 cluster: Support multiple event handlers.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-01-11 15:59:44 -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 Nephin e001980b5c Add filter by image name support to /images/json
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-27 11:00:37 -04:00
Victor Vieux 78ecf8497c Add network rm
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-08 22:36:13 -07:00
Victor Vieux b007cae8b2 Add docker network create
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-08 22:35:07 -07:00
Victor Vieux 8559fb0fc6 remove cluster.Network(IDOrName)
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-08 22:35:07 -07:00
Victor Vieux e634df03a7 add 'docker network ls' support
add 'docker network inspect' suport

Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-08 22:35:07 -07:00
Daniel Nephin 8abf7d32e9 Support filtering images by labels
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-02 15:45:52 -04:00
Alexandre Beslic a792519978 Merge pull request #1208 from vieux/volume_create_delete
docker volume create & docker volume delete
2015-09-23 10:45:44 -07:00
Victor Vieux 79d1ee4861 add volume create
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-18 03:23:22 -07:00
Victor Vieux 440a379860 docker volume rm
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-18 03:22:57 -07:00
Xian Chaobo 5cc6e3f30c fix import/load return code
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-09-15 10:00:49 -04:00
Xian Chaobo a10a39c462 fix pull return code
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-09-10 04:10:28 -04:00
Victor Vieux 77c96908f0 add support for docker volume ls & inspect
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-05 07:56:22 -07:00
Victor Vieux d571b7e39e Revert "prevent double starts with mesos"
This reverts commit 9a93dcf46b.

Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-02 20:33:49 -07:00
Chanwit Kaewkasi 4cdbe875b8 Merge pull request #1155 from vieux/fix_mesos_logs
prevent double logs with mesos
2015-09-03 13:10:52 +07:00
Victor Vieux 42bb1f3f5b Merge pull request #1159 from jimmyxian/fix-tag-images
fix tag image
2015-09-01 11:25:48 -07:00
Victor Vieux 9a93dcf46b prevent double starts with mesos
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-08-31 22:52:43 -07:00
Xian Chaobo 29df83a349 fix tag image
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-08-31 07:17:30 -04:00
Xian Chaobo 12e956e681 add support force remove images
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-08-19 23:09:02 -04:00
Xian Chaobo d4daee4f27 add support images -a
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-08-12 07:39:11 -04:00
Andrea Luzzardi 3bb4373f9f Merge pull request #1111 from vieux/no_json_manual
do not generate JSON by hand
2015-08-04 15:30:30 -07:00
Xian Chaobo a3cf5b9e9c improve build
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-08-04 02:45:06 -04:00
Victor Vieux 7ec33a81b5 do not generate JSON by hand
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-07-30 18:10:13 -07:00
Victor Vieux c1020da636 nits
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-04 18:25:51 -07:00
Victor Vieux 4f9c9f5867 use dockerclient structs
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-04 18:25:51 -07:00
Victor Vieux 2bf6c1a529 improve docker infi with 1.7
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-04 18:25:51 -07:00
Xian 8da3de3cc4 add import unit test
Signed-off-by: Xian <xianchaobo@huawei.com>
2015-05-27 22:11:05 +08:00
Xian Chaobo 1f20358b5d add support import
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-27 22:11:03 +08:00
Victor Vieux 9db6bce98b Merge pull request #823 from vieux/containers
create containers.go
2015-05-26 13:05:26 -07:00