From 750909624c1c36f26d26a31c8af9692c2982ae08 Mon Sep 17 00:00:00 2001 From: Jonathan Striebel Date: Tue, 23 Apr 2019 10:28:09 +0200 Subject: [PATCH 1/4] docker: don't set sbt/ivy cache --- Dockerfile.dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.dev b/Dockerfile.dev index b6fc20f53af..1fd5b151070 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM scalableminds/sbt:master__104 +FROM scalableminds/sbt:sbt-ivy-cache__110 ARG VERSION_NODE="8.x" ENV DEBIAN_FRONTEND noninteractive From 31c67f058435b3d70917118adc5b664a09a1ab6e Mon Sep 17 00:00:00 2001 From: Jonathan Striebel Date: Tue, 23 Apr 2019 10:58:02 +0200 Subject: [PATCH 2/4] Update Dockerfile.dev --- Dockerfile.dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.dev b/Dockerfile.dev index 1fd5b151070..bde5454ba1f 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM scalableminds/sbt:sbt-ivy-cache__110 +FROM scalableminds/sbt:sbt-ivy-cache__111 ARG VERSION_NODE="8.x" ENV DEBIAN_FRONTEND noninteractive From eb9fe6bcd15e0176743fc2576c12fa4712a311af Mon Sep 17 00:00:00 2001 From: Jonathan Striebel Date: Tue, 23 Apr 2019 12:17:48 +0200 Subject: [PATCH 3/4] Update Dockerfile.dev --- Dockerfile.dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.dev b/Dockerfile.dev index bde5454ba1f..013f0b129d4 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM scalableminds/sbt:sbt-ivy-cache__111 +FROM scalableminds/sbt:master__112 ARG VERSION_NODE="8.x" ENV DEBIAN_FRONTEND noninteractive From c228b15e02a02d33712890c6734149dcad01ac65 Mon Sep 17 00:00:00 2001 From: Jonathan Striebel Date: Tue, 23 Apr 2019 15:14:17 +0200 Subject: [PATCH 4/4] use /tmp/.ivy2 in docker-compose --- Dockerfile.dev | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.dev b/Dockerfile.dev index 013f0b129d4..c1fac8029c8 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM scalableminds/sbt:master__112 +FROM scalableminds/sbt:master__113 ARG VERSION_NODE="8.x" ENV DEBIAN_FRONTEND noninteractive diff --git a/docker-compose.yml b/docker-compose.yml index b63e5b579c1..cdcdf3b6463 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -103,7 +103,7 @@ services: working_dir: /home/${USER_NAME:-sbt-user}/webknossos volumes: - ".:/home/${USER_NAME:-sbt-user}/webknossos" - - "${DOCKER_CACHE_PREFIX:-~}/.ivy2:/root/.ivy2" + - "${DOCKER_CACHE_PREFIX:-~}/.ivy2:/tmp/.ivy2" - "${DOCKER_CACHE_PREFIX:-~}/.cache/coursier:/root/.cache/coursier" - "${DOCKER_CACHE_PREFIX:-~}/.cache/yarn:/root/.cache/yarn" user: ${USER_UID:-1000}:${USER_GID:-1000}