da952941 by Adam Heath

Fix docker volume detection.

1 parent 02025b6c
...@@ -70,7 +70,7 @@ done ...@@ -70,7 +70,7 @@ done
70 70
71 has_volume= 71 has_volume=
72 if [[ $INKLUSTER_VOLUME_NAME ]]; then 72 if [[ $INKLUSTER_VOLUME_NAME ]]; then
73 docker volume inspect "inkluster-$INKLUSTER_VOLUME_NAME" 1>/dev/null 2>/dev/null || has_volume=1 73 docker volume inspect "inkluster-$INKLUSTER_VOLUME_NAME" 1>/dev/null 2>/dev/null && has_volume=1
74 fi 74 fi
75 75
76 case "$1" in 76 case "$1" in
...@@ -105,7 +105,7 @@ docker_args+=(-e MAP_UID="$(id -u)" -e MAP_GROUPS="$(id -G)") ...@@ -105,7 +105,7 @@ docker_args+=(-e MAP_UID="$(id -u)" -e MAP_GROUPS="$(id -G)")
105 105
106 if [[ $INKLUSTER_VOLUME_NAME ]]; then 106 if [[ $INKLUSTER_VOLUME_NAME ]]; then
107 if [[ ! $has_volume ]]; then 107 if [[ ! $has_volume ]]; then
108 docker volume create "inkluster-$INKLUSTER_VOLUME_NAME" 108 docker volume create "inkluster-$INKLUSTER_VOLUME_NAME" 1>/dev/null
109 fi 109 fi
110 docker_args+=(-v "inkluster-$INKLUSTER_VOLUME_NAME":/run) 110 docker_args+=(-v "inkluster-$INKLUSTER_VOLUME_NAME":/run)
111 fi 111 fi
......