Skip to content

Commit 63acd9a

Browse files
USE_DOCKER update and Docker build fix (#4)
Co-authored-by: Ludovico Mitchener <ludo@futurehouse.org>
1 parent 1a29946 commit 63acd9a

File tree

3 files changed

+8
-17
lines changed

3 files changed

+8
-17
lines changed

src/fhda/Dockerfile.pinned

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,13 @@ RUN mamba install -c conda-forge -c bioconda -y \
7575
bioconductor-apeglm=1.24.0
7676

7777

78-
COPY requirements.txt .
79-
RUN mamba install -c conda-forge --file requirements.txt -y
78+
COPY kernel_requirements.txt .
79+
80+
# Install conda packages first
81+
RUN mamba install -c conda-forge --file kernel_requirements.txt -y
82+
83+
# Install pip packages
84+
RUN pip install aiodocker ldp==0.23.0 fhaviary[server]==0.18.1 crow-client==0.3.6
8085

8186
# Certain tools are not easily installable via conda. A common practice for
8287
# bioinformaticians is to use udocker to run certain heavy duty omics processing

src/fhda/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os
22
from pathlib import Path
33

4-
USE_DOCKER = bool(os.getenv("USE_DOCKER", "false").lower() == "true")
4+
USE_DOCKER = bool(os.getenv("USE_DOCKER", "true").lower() == "true")
55
USE_R = bool(os.getenv("USE_R", "false").lower() == "true")
66
NB_ENVIRONMENT_DOCKER_IMAGE = os.getenv(
77
"NB_ENVIRONMENT_DOCKER_IMAGE", "futurehouse/bixbench:aviary-notebook-env"

src/fhda/kernel_requirements.txt

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
aiodocker
21
anndata==0.11.1
32
biopython==1.84
4-
datasets
53
ete3==3.1.3
64
gseapy==1.1.4
7-
fhaviary[server] >= 0.18.0
85
keras==3.7.0
9-
ldp
106
jupyter==1.0.0
117
matplotlib==3.10.0
128
matplotlib-venn==1.1.1
@@ -24,13 +20,3 @@ seaborn==0.13.2
2420
scikit-learn==1.6.0
2521
statsmodels==0.14.4
2622
umap-learn==0.5.7
27-
aiofiles
28-
google-auth
29-
google-cloud-storage
30-
google-cloud-secret-manager
31-
google-crc32c
32-
httpx
33-
pydantic
34-
requests
35-
tqdm
36-
crow-client

0 commit comments

Comments
 (0)