Merge pull request #66 from donoghuc/explicit-arg

Pass stack version as argument to image fetch function

Author: donoghuc

docker-setup.sh

@@ -6,12 +6,13 @@ set -e
 
 pull_docker_snapshot() {
   project="${1?project name required}"
+  stack_version_alias="${2?stack version alias required}"
   local docker_image="docker.elastic.co/${project}/${project}${DISTRIBUTION_SUFFIX}:${ELASTIC_STACK_VERSION}"
   echo "Pulling $docker_image"
   if docker pull "$docker_image" ; then
     echo "docker pull successful"
   else
-    case "$ELASTIC_STACK_VERSION_ARG" in
+    case $stack_version_alias in
       "8.previous"|"8.current"|"8.next")
         exit 1
         ;;
@@ -30,8 +31,8 @@ if [ -z "${ELASTIC_STACK_VERSION}" ]; then
     exit 1
 fi
 
-# save the original arg if needed
-ELASTIC_STACK_VERSION_ARG="$ELASTIC_STACK_VERSION"
+# The ELASTIC_STACK_VERSION may be an alias, save the original before translating it
+ELASTIC_STACK_VERSION_ALIAS="$ELASTIC_STACK_VERSION"
 
 echo "Fetching versions from $VERSION_URL"
 VERSIONS=$(curl -s $VERSION_URL)
@@ -64,7 +65,7 @@ export DISTRIBUTION_SUFFIX
 echo "Testing against version: $ELASTIC_STACK_VERSION (distribution: ${DISTRIBUTION:-"default"})"
 
 if [[ "$ELASTIC_STACK_VERSION" = *"-SNAPSHOT" ]]; then
-    pull_docker_snapshot "logstash"
+    pull_docker_snapshot "logstash" $ELASTIC_STACK_VERSION_ALIAS
 fi
 
 if [ -f Gemfile.lock ]; then