Fix docker build for pull requests

Signed-off-by: Daniil Kouznetsov <dkouznetsov@pivotal.io>
pivotal · May 28, 2018 · 9822f79 · 9822f79
1 parent 690d6ee
commit 9822f79
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/ci/pipelines/pipeline.yml.erb b/ci/pipelines/pipeline.yml.erb
@@ -46,7 +46,6 @@ jobs:
     file: LicenseFinder/ci/tasks/build.yml
     params:
       RUBY_VERSION_UNDER_TEST: <%= ruby_version %>
-      USE_LOCAL_DOCKERFILE: true
 <% if setup_slack %>
   on_failure:
     put: slack-alert

diff --git a/ci/scripts/containerize-tests.sh b/ci/scripts/containerize-tests.sh
@@ -7,9 +7,7 @@ source /opt/resource/common.sh
 start_docker 3 3
 
 pushd LicenseFinder
-  if [ $USE_LOCAL_DOCKERFILE ]; then
-    docker build . -t licensefinder/license_finder
-  fi
+  docker build . -t licensefinder/license_finder
 
   docker run -v $PWD:/lf -it licensefinder/license_finder /bin/bash \
     -exlc "cd /lf && ci/scripts/run-tests.sh $RUBY_VERSION_UNDER_TEST"

diff --git a/ci/tasks/build.yml b/ci/tasks/build.yml
@@ -14,4 +14,3 @@ run:
 
 params:
   RUBY_VERSION_UNDER_TEST:
-  USE_LOCAL_DOCKERFILE: