Skip to content

Commit

Permalink
Changed back to named env in environment and specify base in dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
alneberg committed Jan 26, 2024
1 parent c9dda46 commit 2bbd685
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
7 changes: 3 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ WORKDIR /usr/src/anglerfish

# Activate the environment
ARG MAMBA_DOCKERFILE_ACTIVATE=1
RUN micromamba install -y -f /environment.tmp.yml && micromamba clean --all --yes
RUN micromamba install -y -n base -f /environment.tmp.yml && micromamba clean --all --yes

#####
# Devcontainer
Expand All @@ -49,12 +49,11 @@ FROM base as devcontainer
# Useful tools for devcontainer
RUN apt-get update;\
apt-get install -y git vim

RUN eval "$(micromamba shell hook --shell bash)" && python -m pip install -e .[dev]

#####
# Main
#####
FROM base as main
RUN eval "$(micromamba shell hook --shell bash)" && python -m pip install .[dev]
USER $MAMBA_USER
USER $MAMBA_USER
RUN eval "$(micromamba shell hook --shell bash)" && python -m pip install .[dev]
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Development environment for anglerfish
name: base
name: anglerfish-dev
channels:
- conda-forge
- bioconda
Expand Down

0 comments on commit 2bbd685

Please sign in to comment.