Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nightwatch docker update 202212 #319

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Nightwatch docker update 202212 #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f9cd916
Add pandas support to NW docker image.
Dec 8, 2022
f67819c
Merge branch 'main' of https://github.com/desihub/nightwatch into nw-…
Dec 8, 2022
9755a05
Force pip to install desiutil before desimodel.
Dec 11, 2022
9b8eff4
Update uWSGI to recent revision.
Dec 11, 2022
2c05a28
Install pandas with pip, not apt.
Dec 11, 2022
ac453b8
Upgrade pip to reduce build warnings.
Dec 11, 2022
704703e
Merge branch 'main' of https://github.com/desihub/nightwatch into nw-…
Jan 13, 2023
a5c8b00
updated requirements
Jan 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions webapp/Dockerfiles/app/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
FROM python:3.8
FROM python:3.9

WORKDIR /app
ENV PYTHONPATH ${PYTHONPATH}:./nightwatch/py
ENV PYTHONPATH ${PYTHONPATH}:./desimodel/py
ENV PYTHONPATH ${PYTHONPATH}:./desiutil/py
ADD . /app
RUN pip3 install -r requirements.txt
ADD ./webapp/Dockerfiles/app /app
COPY ./py/nightwatch /app/nightwatch
RUN python -m pip install --upgrade pip
RUN cat requirements.txt | xargs -n 1 pip install
EXPOSE 5000

ENTRYPOINT [ "uwsgi" ]
Expand Down
19 changes: 12 additions & 7 deletions webapp/Dockerfiles/app/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
Flask==1.1.2
bokeh==2.1.1
uWSGI==2.0.17.1
astropy==4.0.1
scipy==1.5.0
numpy==1.19.1
fitsio==1.1.2
Flask==2.0.*
bokeh==2.4.*
pandas==1.5.*
uWSGI==2.0.21.*
astropy==5.0.*
scipy==1.7.*
numpy==1.22.*
healpy
fitsio==1.1.*
git+https://github.com/desihub/[email protected]#egg=desiutil
git+https://github.com/desihub/[email protected]#egg=desimodel
git+https://github.com/desihub/[email protected]#egg=desitarget