Switched to only on requirements.txt file and changed Dockerfiles to …

…always pull master branch.
szarma · Mar 17, 2023 · 2b5f43e · 2b5f43e
1 parent 3b650f5
commit 2b5f43e
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 140 deletions.
diff --git a/create_env.sh b/create_env.sh
diff --git a/docker/jupyterhub/jupyterhub_config.py b/docker/jupyterhub/jupyterhub_config.py
@@ -124,7 +124,7 @@ def create_object(self):
     'jupyterhub-user-{username}': notebook_dir,
 }
 c.DockerSpawner.name_template = "{prefix}-{username}"
-c.DockerSpawner.debug = True
+#c.DockerSpawner.debug = True
 c.DockerSpawner.allowed_images = get_allowed_images
 # c.DockerSpawner.image = os.environ['DOCKER_JUPYTER_CONTAINER'] + ':' + os.environ['ISLETS_VERSION']
 c.DockerSpawner.remove = True

diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile
@@ -32,14 +32,11 @@ RUN jupyter lab build
 
 # Install the islets module
 WORKDIR /opt/islets/
-RUN git clone --branch=docker \
-              --depth=1 \
-              --single-branch \
-              https://github.com/szarma/Physio_Ca.git
+RUN git clone --depth=1 https://github.com/szarma/Physio_Ca.git
 WORKDIR /opt/islets/Physio_Ca/
 RUN pip install .
 RUN chmod +x /opt/islets/Physio_Ca/scripts/full_process.py
 
 # Link to data and set the home directory as default work directory
 WORKDIR ${HOME}/work
-RUN ln -s /data local_data
+RUN ln -s /data ${HOME}/work/local_data
diff --git a/docker/server_dev/Dockerfile b/docker/server_dev/Dockerfile
@@ -33,15 +33,12 @@ RUN jupyter lab build
 
 # Install the islets module
 WORKDIR /opt/islets/
-RUN git clone --branch=docker \
-              --depth=1 \
-              --single-branch \
-              https://github.com/szarma/Physio_Ca.git
+RUN git clone --depth=1 https://github.com/szarma/Physio_Ca.git
 WORKDIR /opt/islets/Physio_Ca/
 RUN pip install --editable .
 RUN chmod +x /opt/islets/Physio_Ca/scripts/full_process.py
 
 # Link to data and set the home directory as default work directory
 WORKDIR ${HOME}/work
-RUN ln -s /data local_data
-RUN ln -s /opt/islets/Physio_Ca Physio_Ca
+RUN ln -s /data ${HOME}/work/local_data
+RUN ln -s /opt/islets/Physio_Ca ${HOME}/work/Physio_Ca
diff --git a/requirements_docker.txt → requirements.txt b/requirements_docker.txt → requirements.txt
diff --git a/requirements_new_dash.txt b/requirements_new_dash.txt
diff --git a/requirements_old_dash.txt b/requirements_old_dash.txt