Merge branch 'master' into test

dockerstuff · Oct 24, 2023 · 543a029 · 543a029
2 parents 58a3aba + 9db0ea2
commit 543a029
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.env b/.env
@@ -1,17 +1,17 @@
-# ISIS_VERSION="7.1.0"
-# ASP_VERSION="3.2.0"
-ISIS_VERSION="6"
-ASP_VERSION="3.1"
+ISIS_VERSION="7.1.0"
+ASP_VERSION="3.2.0"
+# ISIS_VERSION="6"
+# ASP_VERSION="3.1"
 
 TAG="latest"
 
 # BASE_IMAGE="jupyter/scipy-notebook:latest"
 GISPY_BASE_IMAGE="jupyter/scipy-notebook:latest"
 GISPY_NEW_IMAGE="jupyter-gispy:$TAG"
 
-ISIS_BASE_IMAGE="$GISPY_NEW_IMAGE"
-# ISIS_NEW_IMAGE="jupyter-isis:$ISIS_VERSION"
-ISIS_NEW_IMAGE="jupyter-isis:$TAG"
+# ISIS_BASE_IMAGE="$GISPY_NEW_IMAGE"
+ISIS_BASE_IMAGE="jupyter/minimal-notebook:latest"
+ISIS_NEW_IMAGE="jupyter-isis:$ISIS_VERSION"
 
 ASP_BASE_IMAGE="$ISIS_NEW_IMAGE"
 # ASP_NEW_IMAGE="jupyter-isis-asp:$ISIS_VERSION-$ASP_VERSION"

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -20,7 +20,7 @@ services:
       - gispy 
     image: $ISIS_NEW_IMAGE
 
-  asp:
+  isis-asp:
     build:
       context: dockerfiles/.
       dockerfile: isis-asp.dockerfile

diff --git a/dockerfiles/isis-asp.dockerfile b/dockerfiles/isis-asp.dockerfile
@@ -24,7 +24,7 @@ USER $NB_UID
 
 ARG ASP_VERSION=""
 
-COPY asp.txt /tmp/asp.tmp
+COPY isis-asp.txt /tmp/asp.tmp
 
 RUN [ -n "${ASP_VERSION}" ]                                             && \
     sed "s/\(.*stereo-pipeline\).*/\1=$ASP_VERSION/" /tmp/asp.tmp       \

diff --git a/dockerfiles/asp.txt → dockerfiles/isis-asp.txt b/dockerfiles/asp.txt → dockerfiles/isis-asp.txt