Skip to content

Commit

Permalink
Merge pull request datajoint#44 from kabilar/main
Browse files Browse the repository at this point in the history
Change dependency installation
  • Loading branch information
CBroz1 authored Mar 9, 2022
2 parents 7df79d6 + 94ab2cd commit 564c32f
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
9 changes: 4 additions & 5 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
FROM datajoint/djlab:py3.8-debian
FROM datajoint/djbase:py3.9-debian-fcd8909

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 \
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile.test
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM datajoint/djlab:py3.8-debian
FROM datajoint/djbase:py3.9-debian-fcd8909

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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion apt_requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
locales-all
locales-all
git

0 comments on commit 564c32f

Please sign in to comment.