Upgrade to Swarm 1.0.0 (production ready release)
Docker Inc announced Swarm 1.0: Production-ready release (https://blog.docker.com/2015/11/swarm-1-0/) Closes-Bug: #1513661 Change-Id: I128c77e687b9acf244a1149523860c9f7c32ae6a
This commit is contained in:
parent
d90bc0ef7d
commit
bcbcab36b6
|
@ -15,8 +15,8 @@ write_files:
|
||||||
TimeoutStartSec=0
|
TimeoutStartSec=0
|
||||||
ExecStartPre=-/usr/bin/docker kill swarm-agent
|
ExecStartPre=-/usr/bin/docker kill swarm-agent
|
||||||
ExecStartPre=-/usr/bin/docker rm swarm-agent
|
ExecStartPre=-/usr/bin/docker rm swarm-agent
|
||||||
ExecStartPre=-/usr/bin/docker pull swarm:0.4.0
|
ExecStartPre=-/usr/bin/docker pull swarm:1.0.0
|
||||||
ExecStart=/usr/bin/docker run -e http_proxy=$HTTP_PROXY -e https_proxy=$HTTPS_PROXY -e no_proxy=$NO_PROXY --name swarm-agent swarm:0.4.0 join --addr $NODE_IP:2375 $DISCOVERY_URL
|
ExecStart=/usr/bin/docker run -e http_proxy=$HTTP_PROXY -e https_proxy=$HTTPS_PROXY -e no_proxy=$NO_PROXY --name swarm-agent swarm:1.0.0 join --addr $NODE_IP:2375 $DISCOVERY_URL
|
||||||
ExecStop=/usr/bin/docker stop swarm-agent
|
ExecStop=/usr/bin/docker stop swarm-agent
|
||||||
ExecStartPost=/usr/bin/curl -sf -X PUT -H 'Content-Type: application/json' \
|
ExecStartPost=/usr/bin/curl -sf -X PUT -H 'Content-Type: application/json' \
|
||||||
--data-binary '{"Status": "SUCCESS", "Reason": "Setup complete", "Data": "OK", "UniqueId": "00000"}' \
|
--data-binary '{"Status": "SUCCESS", "Reason": "Setup complete", "Data": "OK", "UniqueId": "00000"}' \
|
||||||
|
|
|
@ -11,14 +11,14 @@ OnFailure=swarm-manager-failure.service
|
||||||
TimeoutStartSec=0
|
TimeoutStartSec=0
|
||||||
ExecStartPre=-/usr/bin/docker kill swarm-manager
|
ExecStartPre=-/usr/bin/docker kill swarm-manager
|
||||||
ExecStartPre=-/usr/bin/docker rm swarm-manager
|
ExecStartPre=-/usr/bin/docker rm swarm-manager
|
||||||
ExecStartPre=-/usr/bin/docker pull swarm:0.4.0
|
ExecStartPre=-/usr/bin/docker pull swarm:1.0.0
|
||||||
ExecStart=/usr/bin/docker run --name swarm-manager \\
|
ExecStart=/usr/bin/docker run --name swarm-manager \\
|
||||||
-v /etc/docker:/etc/docker \\
|
-v /etc/docker:/etc/docker \\
|
||||||
-p 2376:2375 \\
|
-p 2376:2375 \\
|
||||||
-e http_proxy=$HTTP_PROXY \\
|
-e http_proxy=$HTTP_PROXY \\
|
||||||
-e https_proxy=$HTTPS_PROXY \\
|
-e https_proxy=$HTTPS_PROXY \\
|
||||||
-e no_proxy=$NO_PROXY \\
|
-e no_proxy=$NO_PROXY \\
|
||||||
swarm:0.4.0 \\
|
swarm:1.0.0 \\
|
||||||
manage -H tcp://0.0.0.0:2375 \\
|
manage -H tcp://0.0.0.0:2375 \\
|
||||||
END_SERVICE_TOP
|
END_SERVICE_TOP
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue