Commit Graph

86 Commits

Author SHA1 Message Date
Xian Chaobo 1fef59f738 fresh image when receive commit event
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2016-01-08 17:25:30 +08:00
Dong Chen 02553d0727 Cover connection failure error reported by dockerclient and by proxy cases.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2015-12-15 19:20:29 -08:00
Dong Chen 9bc6c35321 Use engine connection error to fail engine fast.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2015-12-15 19:13:03 -08:00
Dong Chen ec3b00c484 Reorganize engine failure detection procedure. Change engine option 'RefreshRetry' to 'FailureRetry'.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2015-12-15 19:13:03 -08:00
Dong Chen 4d24256c19 Use failureCount as a secondary health indicator.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2015-12-15 19:13:03 -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
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
Alexandre Beslic e82752cace Merge pull request #1363 from dongluochen/refreshConfiguration
add engine options for refresh interval
2015-11-25 14:30:16 -08:00
Dong Chen a150a0d521 Add cli test for engine refresh options
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2015-11-18 13:45:39 -08:00
Victor Vieux 3b6d9b6820 monitor events just after the info
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-11-02 17:04:01 -08:00
Victor Vieux 3f29299afd refresh volumes after creating a container
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-11-02 16:31:57 -08:00
Victor Vieux 0fa9b97f4e refresh images after a rmi
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-11-02 16:20:24 -08:00
Victor Vieux d2c5446ea0 Merge pull request #1340 from jimmyxian/volume-driver
Move VolumeDriver to HostConfig
2015-10-28 15:28:53 -07:00
Dong Chen c9f3471dba add engine options for refresh interval
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2015-10-28 12:56:48 -07:00
Xian Chaobo 588c29c3cc move VolumeDriver to HostConfig
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-10-28 10:58:24 +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
Roman Iuvshin 40a22e5a13 Fix log info message
Signed-off-by: Roman Iuvshin <riuvshin@codenvy.com>
2015-10-23 17:22:53 +03:00
Alexandre Beslic 1e30ce215f Merge pull request #1262 from vieux/libnetwork
add 'docker network' support
2015-10-13 11:09:27 -07:00
Jia Mi 660299f749 Engine should refresh the container on container rename event
Signed-off-by: Jia Mi <winters.mi@gmail.com>
2015-10-10 15:17:48 +08:00
Andrea Luzzardi cb2ceea702 engine: Added a concurrent safe refresh delayer.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-10-09 11:32:03 -07: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 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
Andrea Luzzardi f1782fed90 engine cleanup: Don't mess with the global random.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-10-07 17:27:41 -07:00
Andrea Luzzardi 13483451da engine: More robust refresh loop.
- Random heartbeat (between 30 and 60 seconds).
- Requires 3 failures before marking a node as dead.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-10-06 19:39:39 -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
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
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 987dc06365 Merge pull request #1168 from abronan/fix_refresh
Fix panic on Container/Image refresh after Engine removal
2015-09-03 13:16:40 +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
Alexandre Beslic a7303ecc5e Fix panic on various calls when assigning Engine client to nil
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-09-02 09:41:51 -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
Victor Vieux 58482a13d2 enable better refresh with mesos 0.23
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-08-14 17:11:19 -07:00
Xian Chaobo d4daee4f27 add support images -a
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-08-12 07:39:11 -04:00
James Wang Yong Qiao 88bbdff2e0 Fix the spell error.
Signed-off-by: James Wang Yong Qiao <jamesyongqiao@gmail.com>
2015-08-05 02:44:31 -04:00
Victor Vieux 2606db4486 Merge pull request #1085 from jimmyxian/improve-build
Improve build
2015-08-04 11:44:17 -07:00
Xian Chaobo a3cf5b9e9c improve build
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-08-04 02:45:06 -04:00
mariusz 2605d398b6 Updated the identifier as requested by @aluzzardi
Signed-off-by: Mariusz Borsa <mborsa@polyverse.io>
Tickle Jenkins
2015-07-31 16:32:12 -07:00
mariusz e1daa7c47b Error from Engine when refresh doesn't pickup new container
Fix for https://github.com/docker/swarm/issues/1081
    Signed-off-by: Mariusz Borsa <mborsa@polyverse.io>
2015-07-31 11:21:24 -07:00
Peeyush Gupta fa0cc6d1df Fixing spelling of again
Signed-off-by: Peeyush Gupta <gpeeyush@linux.vnet.ibm.com>
2015-07-07 11:09:39 +05:30
ealang 15fc8d8210 Prevent panic if a container is removed during a refresh
If InspectContainer fails, Engine.containers gets set to nil.

Log cause of updateContainer failure.

Signed-off-by: Eric Lang <ealang@gmail.com>
2015-06-29 22:04:15 -05:00
Andrea Luzzardi 82fc920e90 Engine: fix panic in disconnect with events.
Replaces #937

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-06-12 18:51:05 -07:00
Victor Vieux 1afc1be2d1 support only 1.6.0+
update test/regression/run.sh
uddate doc
update tests

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-12 13:27:15 -07:00
Marco Mancini 9e27ae9140 Fix reserved cpus computation
Added test as Vieux suggested/Fixed CpuShare computation

Signed-off-by: Marco Mancini <marcomancini72@gmail.com>
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-04 18:59:15 -07:00
Victor Vieux 15a8b73ab6 fix cpus
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-04 17:26:32 -07:00