bump ci images

Author: renefritze

.binder/Dockerfile

@@ -5,7 +5,7 @@
 # the container, local dev needs it in path from mounted src
 # we trick docker into fulfilling both roles via a conditional ONBUILD
 # if you want to use the local dev setup, see docker/docker-compose.yml
-ARG BASE=pymor/dealii_py3.7:7008694b9b9919cce0947367c713b54d08574661
+ARG BASE=pymor/testing_py3.9:4ee2b386dc8fee933fd090d334b329103f9bc918
 ARG BUILD_ENV=binder
 
 FROM $BASE as image_binder
@@ -27,7 +27,9 @@ ARG PYMOR_JUPYTER_TOKEN
 
 USER root
 RUN useradd -d /home/pymor --shell /bin/bash -u ${NB_UID} -o -c "" -m ${NB_USER} && \
-    chown -R ${NB_USER} /home/pymor /src/ 
+    chown -R ${NB_USER} /home/pymor /src/ && \
+    apt update && \
+    apt install -y libtbb-dev
 
 RUN bash -c "([[ -e /src/setup.py ]] && pip install /src || echo 'no install needed') && pip install jupyter"
 USER ${NB_USER}

.binder/Dockerfile.in

@@ -27,7 +27,9 @@ ARG PYMOR_JUPYTER_TOKEN
 
 USER root
 RUN useradd -d /home/pymor --shell /bin/bash -u ${NB_UID} -o -c "" -m ${NB_USER} && \
-    chown -R ${NB_USER} /home/pymor /src/
+    chown -R ${NB_USER} /home/pymor /src/ && \
+    apt update && \
+    apt install -y libtbb-dev
 
 RUN bash -c "([[ -e /src/setup.py ]] && pip install /src || echo 'no install needed') && pip install jupyter"
 USER ${NB_USER}

.env

@@ -1,3 +1,4 @@
-DOCKER_BASE_PYTHON=3.7
-PYPI_MIRROR_TAG=eba3cf929d163c9e2aa56d26b9639894ee6789dc
-CI_IMAGE_TAG=eba3cf929d163c9e2aa56d26b9639894ee6789dc
+DOCKER_BASE_PYTHON=3.9
+PYPI_MIRROR_TAG=4ee2b386dc8fee933fd090d334b329103f9bc918
+CI_IMAGE_TAG=4ee2b386dc8fee933fd090d334b329103f9bc918
+PYMOR_TEST_OS=debian_buster

Makefile

@@ -25,9 +25,6 @@ export $(shell sed 's/=.*//' $(ENV_FILE))
 
 .PHONY: docker_file
 
-docs:
-	PYTHONPATH=${PWD}/src/:${PYTHONPATH} make -C docs html
-
 docker_file:
 	 sed -e "s;CI_IMAGE_TAG;$(CI_IMAGE_TAG);g" -e "s;DOCKER_BASE_PYTHON;$(DOCKER_BASE_PYTHON);g" \
 		 .binder/Dockerfile.in > .binder/Dockerfile
@@ -48,9 +45,12 @@ docker_tutorials: NB_DIR=docs/_build/html
 docker_tutorials: docker_docs docker_jupyter
 
 docker_test: docker_image
-	$(DOCKER_COMPOSE) up pytest
+	$(DOCKER_COMPOSE) run --service-ports jupyter /src/.ci/travis.script.bash
 
 docker_jupyter: docker_image
 	NB_DIR=$(NB_DIR) $(DOCKER_COMPOSE) up jupyter
 docker_wheel_check: docker_image
 	PYMOR_TEST_OS=$(PYMOR_TEST_OS) $(DOCKER_COMPOSE) run --service-ports wheel_check bash
+
+docs:
+	PYTHONPATH=${PWD}/src/:${PYTHONPATH} make -C docs html