Merge pull request #1 from chilanti/build-fix

Integrating build fixes
appsody · Oct 4, 2019 · 9463fe7 · 9463fe7
2 parents b7e99d3 + 335e028
commit 9463fe7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,4 +8,4 @@ deploy:
     branch: master
     tags: true
   provider: script
-  script: bash ./build.sh $CLI_VERSION $TRAVIS_TAG
+  script: bash ./build.sh $CLI_VERSION $TRAVIS_TAG $CONTROLLER_VERSION
diff --git a/build.sh b/build.sh
@@ -1,10 +1,11 @@
 #!/bin/bash
-#Takes two parms:
+#Takes three parms:
 #CLI_VERSION
 #TRAVIS_TAG
+#CONTROLLER_VERSION
 set -e
-export CONTROLLER_BASE_URL := https://github.com/appsody/controller/releases/download/$CONTROLLER_VERSION
+export CONTROLLER_BASE_URL=https://github.com/appsody/controller/releases/download/$3
 echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-docker build -t $DOCKER_ORG/appsody-k8s:$2 -t $DOCKER_ORG/appsody-k8s:latest --build-arg CLI_VERSION=$1 --build-arg CONTROLLER_BASE_URL=${CONTROLLER_BASE_URL}.
+docker build -t $DOCKER_ORG/appsody-k8s:$2 -t $DOCKER_ORG/appsody-k8s:latest --build-arg CLI_VERSION=$1 --build-arg CONTROLLER_BASE_URL=${CONTROLLER_BASE_URL} .
 docker push $DOCKER_ORG/appsody-k8s
 docker push $DOCKER_ORG/appsody-k8s:$2