From 4335f479e30aa8e62dd332ae96cdf3363ef3d0e4 Mon Sep 17 00:00:00 2001 From: Kabilar Gunalan Date: Tue, 8 Mar 2022 14:43:08 -0600 Subject: [PATCH 1/3] Change dependency installation --- Dockerfile.dev | 7 +++---- Dockerfile.test | 8 ++++---- apt_requirements.txt | 3 ++- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile.dev b/Dockerfile.dev index 3ebcbb21..c0c3e74a 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,10 +1,9 @@ FROM datajoint/djlab:py3.8-debian -USER root -RUN apt-get update -y -RUN apt-get install git -y +USER anaconda:anaconda -USER anaconda +COPY ./workflow-array-ephys/apt_requirements.txt /tmp/ +RUN /entrypoint.sh echo "Installed dependencies." RUN mkdir /main/element-lab \ /main/element-animal \ diff --git a/Dockerfile.test b/Dockerfile.test index e336ffe7..a3dd2168 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -1,10 +1,10 @@ FROM datajoint/djlab:py3.8-debian -USER root -RUN apt-get update -y -RUN apt-get install git -y +USER anaconda:anaconda + +COPY ./workflow-array-ephys/apt_requirements.txt /tmp/ +RUN /entrypoint.sh echo "Installed dependencies." -USER anaconda WORKDIR /main/workflow-array-ephys # Option 1 - Install DataJoint's remote fork of the workflow and elements diff --git a/apt_requirements.txt b/apt_requirements.txt index 3daada47..c55e67b1 100644 --- a/apt_requirements.txt +++ b/apt_requirements.txt @@ -1 +1,2 @@ -locales-all \ No newline at end of file +locales-all +git \ No newline at end of file From 653bb7bf0930ecba37423794d89ec6b717df22d1 Mon Sep 17 00:00:00 2001 From: Kabilar Gunalan Date: Tue, 8 Mar 2022 14:52:40 -0600 Subject: [PATCH 2/3] Fix links --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 98341270..24182e1d 100644 --- a/README.md +++ b/README.md @@ -27,12 +27,12 @@ Elements (`element-lab`, `element-animal`, `element-session`, ### element-lab ![element-lab]( -https://github.com/datajoint/element-lab/raw/main/images/element_lab_diagram.svg) +https://github.com/datajoint/element-lab/raw/main/images/lab_diagram.svg) ### element-animal ![element-animal]( -https://github.com/datajoint/element-animal/blob/main/images/subject_diagram.svg) +https://github.com/datajoint/element-animal/raw/main/images/subject_diagram.svg) ### assembled with element-array-ephys From 94ab2cde3ba9c234cb3fd93ddac0155a2a5df240 Mon Sep 17 00:00:00 2001 From: Kabilar Gunalan Date: Tue, 8 Mar 2022 15:11:39 -0600 Subject: [PATCH 3/3] Change base image --- Dockerfile.dev | 2 +- Dockerfile.test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.dev b/Dockerfile.dev index 07d71c8e..1296cf7b 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM datajoint/djlab:py3.8-debian +FROM datajoint/djbase:py3.9-debian-fcd8909 USER anaconda:anaconda diff --git a/Dockerfile.test b/Dockerfile.test index 649fee07..14022f54 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -1,4 +1,4 @@ -FROM datajoint/djlab:py3.8-debian +FROM datajoint/djbase:py3.9-debian-fcd8909 USER anaconda:anaconda