Skip to content

Commit

Permalink
#2935: install_rancher, bump rancher agent version
Browse files Browse the repository at this point in the history
  • Loading branch information
jeff1evesque committed May 1, 2018
1 parent 65d7b57 commit 93d1d00
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions install_rancher
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## system configurations
CWD=$(pwd)
RANCHER_VERSION='v2.0.0'
RANCHER_AGENT_VERSION='v2.0.3'
RANCHER_REPO='https://github.com/rancher/cli'
BOOT2DOCKER_REPO='https://github.com/boot2docker/boot2docker'
OPERATING_SYSTEM=$(uname -s)
Expand Down Expand Up @@ -136,12 +137,12 @@ if docker -v >/dev/null 2>&1; then
## docker toolbox provides 'default' container
if [ "$DISTRO_TYPE" = 'windows' ] && \
[ "$RANCHER_CONTAINER" != 'default' ] && \
docker ps -a | grep $RANCHER_CONTAINER;
docker ps -a | grep "$RANCHER_CONTAINER";
then
docker kill "$RANCHER_CONTAINER"
docker rm "$RANCHER_CONTAINER"
elif [ "$DISTRO_TYPE" != 'windows' ] && \
docker ps -a | grep $RANCHER_CONTAINER;
docker ps -a | grep "$RANCHER_CONTAINER";
then
docker kill "$RANCHER_CONTAINER"
docker rm "$RANCHER_CONTAINER"
Expand Down Expand Up @@ -321,7 +322,7 @@ if docker -v >/dev/null 2>&1; then
--privileged \
-v /var/run/docker.sock:/var/run/docker.sock \
-v /var/lib/rancher:/var/lib/rancher \
rancher/agent:v1.2.9 \
rancher/agent:"$RANCHER_AGENT_VERSION" \
"$RANCHER_URL/v1/scripts/$TOKEN"

## create rancher-compose
Expand Down

0 comments on commit 93d1d00

Please sign in to comment.