Browse Source

Update docker-py to 3.5.0 (#4125)

* Update docker-py to 3.5.0

* [ci run-all]

* find the dockerfile when outside the fwroot directory
Nate 6 years ago
parent
commit
86bcafa4dc
3 changed files with 3 additions and 3 deletions
  1. 1 1
      Dockerfile
  2. 1 1
      tfb
  3. 1 1
      toolset/travis/travis_diff.py

+ 1 - 1
Dockerfile

@@ -14,7 +14,7 @@ RUN apt -qqy install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--
   libmysqlclient-dev            `# Needed for MySQL-python` \
   libmysqlclient-dev            `# Needed for MySQL-python` \
   libpq-dev                     `# Needed for psycopg2`
   libpq-dev                     `# Needed for psycopg2`
 
 
-RUN pip install colorama==0.3.1 requests MySQL-python psycopg2-binary pymongo docker==3.1.0
+RUN pip install colorama==0.3.1 requests MySQL-python psycopg2-binary pymongo docker==3.5.0
 
 
 ENV PYTHONPATH /FrameworkBenchmarks
 ENV PYTHONPATH /FrameworkBenchmarks
 ENV FWROOT /FrameworkBenchmarks
 ENV FWROOT /FrameworkBenchmarks

+ 1 - 1
tfb

@@ -102,5 +102,5 @@ if ! docker network inspect tfb >/dev/null 2>&1; then
 fi
 fi
 
 
 test -t 1 && USE_TTY="-t"
 test -t 1 && USE_TTY="-t"
-docker build -t techempower/tfb - < Dockerfile
+docker build -t techempower/tfb - < ${SCRIPT_ROOT}/Dockerfile
 exec docker run -i ${USE_TTY} --rm --network tfb -v /var/run/docker.sock:/var/run/docker.sock -v ${SCRIPT_ROOT}:/FrameworkBenchmarks techempower/tfb "${@}"
 exec docker run -i ${USE_TTY} --rm --network tfb -v /var/run/docker.sock:/var/run/docker.sock -v ${SCRIPT_ROOT}:/FrameworkBenchmarks techempower/tfb "${@}"

+ 1 - 1
toolset/travis/travis_diff.py

@@ -170,7 +170,7 @@ if re.search(r'\[ci lang .+\]', last_commit_msg, re.M):
 # Also for now, ignore the old linux setup folders, as we don't want to
 # Also for now, ignore the old linux setup folders, as we don't want to
 # trigger a full run as we remove old fw_depends scripts. [ci run-all] will
 # trigger a full run as we remove old fw_depends scripts. [ci run-all] will
 # still work if it's needed.
 # still work if it's needed.
-if re.search(r'^toolset\/(?!(travis\/|continuous\/|scaffolding\/))|^tfb', changes, re.M) is not None:
+if re.search(r'^toolset\/(?!(travis\/|continuous\/|scaffolding\/))|^tfb|^Dockerfile', changes, re.M) is not None:
     print("Found changes to core toolset. Running all tests.")
     print("Found changes to core toolset. Running all tests.")
     run_tests = test_dirs
     run_tests = test_dirs
     quit_diffing()
     quit_diffing()