Merge branch '10077-workbench-integration-tests' closes #10077

[arvados.git] / build / run-build-docker-jobs-image.sh

diff --git a/build/run-build-docker-jobs-image.sh b/build/run-build-docker-jobs-image.sh
index 15f788163ed604ea4592daae668c3dbe9e888923..22f6f54288741d2ed4723e9260234b469fb24591 100755 (executable)
--- a/build/run-build-docker-jobs-image.sh
+++ b/build/run-build-docker-jobs-image.sh
@@ -118,17 +118,11 @@ timer_reset
 
 # clean up the docker build environment
 cd "$WORKSPACE"
-cd docker
-rm -f jobs-image
-rm -f config.yml
-
-# Get test config.yml file
-cp $HOME/docker/config.yml .
-
+cd docker/jobs
 if [[ ! -z "$tags" ]]; then
-  COMMIT=${tags/,*/} ./build.sh jobs-image
+    docker build --build-arg COMMIT=${tags/,*/} -t arvados/jobs .
 else
-  ./build.sh jobs-image
+    docker build -t arvados/jobs .
 fi
 
 ECODE=$?
@@ -147,8 +141,8 @@ timer_reset
 if [[ "$ECODE" != "0" ]]; then
     title "upload arvados images SKIPPED because build failed"
 else
-    if [[ $upload == true ]]; then 
-        ## 20150526 nico -- *sometimes* dockerhub needs re-login 
+    if [[ $upload == true ]]; then
+        ## 20150526 nico -- *sometimes* dockerhub needs re-login
         ## even though credentials are already in .dockercfg
         docker login -u arvados