Skip to content

Commit 7b228b9

Browse files
committed
docker updated with requirements
1 parent b7fe79c commit 7b228b9

File tree

1 file changed

+8
-15
lines changed

1 file changed

+8
-15
lines changed

Dockerfile

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ENV GH_TOKEN=${GITHUB_TOKEN}
1717
# Streamlit app Gihub user name (to download artifact from).
1818
ARG GITHUB_USER=OpenMS
1919
# Streamlit app Gihub repository name (to download artifact from).
20-
ARG GITHUB_REPO=nuxl-app
20+
ARG GITHUB_REPO=streamlit-template
2121

2222
USER root
2323

@@ -50,18 +50,12 @@ RUN wget -q \
5050
&& rm -f Miniforge3-Linux-x86_64.sh
5151
RUN mamba --version
5252

53-
COPY environment.yml ./environment.yml
54-
RUN mamba env create -f environment.yml
53+
# Setup mamba environment.
54+
RUN mamba create -n streamlit-env python=3.10
5555
RUN echo "mamba activate streamlit-env" >> ~/.bashrc
5656
SHELL ["/bin/bash", "--rcfile", "~/.bashrc"]
5757
SHELL ["mamba", "run", "-n", "streamlit-env", "/bin/bash", "-c"]
5858

59-
# Setup mamba environment.
60-
#RUN mamba create -n streamlit-env python=3.10
61-
#RUN echo "mamba activate streamlit-env" >> ~/.bashrc
62-
#SHELL ["/bin/bash", "--rcfile", "~/.bashrc"]
63-
#SHELL ["mamba", "run", "-n", "streamlit-env", "/bin/bash", "-c"]
64-
6559
# Install up-to-date cmake via mamba and packages for pyOpenMS build.
6660
RUN mamba install cmake
6761
RUN pip install --upgrade pip && python -m pip install -U setuptools nose cython autowrap pandas numpy pytest
@@ -99,11 +93,10 @@ RUN rm -rf src doc CMakeFiles
9993
#RUN pip install dist/*.whl
10094

10195
# Install other dependencies (excluding pyopenms)
102-
#COPY requirements.txt ./requirements.txt
103-
#RUN grep -Ev '^pyopenms([=<>!~].*)?$' requirements.txt > requirements_cleaned.txt && mv requirements_cleaned.txt requirements.txt
104-
#RUN pip install -r requirements.txt
96+
COPY requirements.txt ./requirements.txt
97+
RUN grep -Ev '^pyopenms([=<>!~].*)?$' requirements.txt > requirements_cleaned.txt && mv requirements_cleaned.txt requirements.txt
98+
RUN pip install -r requirements.txt
10599

106-
#RUN pip install nuxl-rescore==0.2.0
107100
# Copy the package into the image
108101
COPY ./nuxl_rescore/nuxl_rescore-0.3.0.tar.gz /tmp/nuxl_rescore-0.3.0.tar.gz
109102
# Install it
@@ -132,6 +125,7 @@ RUN rm -rf openms-build
132125
FROM compile-openms AS run-app
133126
# Create workdir and copy over all streamlit related files/folders.
134127

128+
# note: specifying folder with slash as suffix and repeating the folder name seems important to preserve directory structure
135129
# note: specifying folder with slash as suffix and repeating the folder name seems important to preserve directory structure
136130
WORKDIR /app
137131
COPY app.py /app/app.py
@@ -173,5 +167,4 @@ RUN if [ -n "$GH_TOKEN" ]; then \
173167

174168
# Run app as container entrypoint.
175169
EXPOSE $PORT
176-
ENTRYPOINT ["/app/entrypoint.sh"]
177-
170+
ENTRYPOINT ["/app/entrypoint.sh"]

0 commit comments

Comments
 (0)