Docker / config tweaks.

mozilla · Jan 12, 2017 · bcc679c · bcc679c
1 parent 108710a
commit bcc679c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/docker.make b/docker.make
@@ -3,8 +3,7 @@
 HERE = $(shell pwd)
 BIN = $(HERE)/bin
 PYTHON = $(BIN)/python
-PIP = $(BIN)/pip
-INSTALL = $(PIP) install --no-deps --no-cache-dir \
+INSTALL = $(BIN)/pip install --no-deps --no-cache-dir \
 	--disable-pip-version-check -f $(HERE)/wheelhouse/
 
 DATAMAPS_DOWNLOAD = https://github.com/ericfischer/datamaps/archive

diff --git a/docker/mysql/Dockerfile b/docker/mysql/Dockerfile
@@ -1,4 +1,4 @@
-FROM mysql:5.6.29
+FROM mysql:5.6
 ENV MYSQL_ROOT_PASSWORD=location
 ENV MYSQL_DATABASE=location
 ENV MYSQL_USER=location

diff --git a/docker/redis/Dockerfile b/docker/redis/Dockerfile
@@ -1,2 +1,2 @@
-FROM redis:2.8.23
+FROM redis:2.8
 EXPOSE "6379"
diff --git a/pytest.ini b/pytest.ini
@@ -1,3 +1,4 @@
 [pytest]
-addopts = --pyargs -q -rw -s
+addopts = --pyargs -q -rw -s -p no:cacheprovider --durations=10
 python_files = test_*.py tests.py
+testpaths = ichnaea