-
Notifications
You must be signed in to change notification settings - Fork 69
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.
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
Merge delphi_web_python
Docker image from operations
repo
#1043
Conversation
609745f
to
6d8c123
Compare
nice! you can then remove these lines as well: delphi-epidata/dev/local/Makefile Lines 124 to 125 in 3d37c59
|
and looks like we couldve/shouldve removed these lines already too: delphi-epidata/dev/local/Makefile Lines 101 to 102 in 3d37c59
|
Good call. Did that and removed those from the CI build too. |
with this PR, we have 3 different "requirements.txt" files in this repo: (ignoring
all 3 are used in only i have a PR (#1046) against this branch. my changes sort the 3 requirements files, and remove duplicated entries from the new one. we should prune down that file some more if we can, maybe even remove it entirely by moving its entries to the other two files. a caveat is that |
|
* sorted requirements.txt files * removed duplicated requirements from ./dev/docker/python/requirements.txt * reduce runs of "pip install" when creating "delphi_web_python" docker image * renamed requirements.txt to requirements.api.txt * merge dev/docker/python/requirements.txt with requirements.dev.txt * deduplicate packages in requirements.api.txt and requirements.dev.txt * pinned packages in requirements.dev.txt and removed unused Co-authored-by: Dmitry Shemetov <[email protected]>
- merge operations repo delphi_python Dockerfile into delphi_web_python - copy Python requirements file to this directory - copy setup.sh to this directory
Co-authored-by: melange396 <[email protected]>
* sorted requirements.txt files * removed duplicated requirements from ./dev/docker/python/requirements.txt * reduce runs of "pip install" when creating "delphi_web_python" docker image * renamed requirements.txt to requirements.api.txt * merge dev/docker/python/requirements.txt with requirements.dev.txt * deduplicate packages in requirements.api.txt and requirements.dev.txt * pinned packages in requirements.dev.txt and removed unused Co-authored-by: Dmitry Shemetov <[email protected]>
ef63e3b
to
08b4589
Compare
* sorted requirements.txt files * removed duplicated requirements from ./dev/docker/python/requirements.txt * reduce runs of "pip install" when creating "delphi_web_python" docker image * renamed requirements.txt to requirements.api.txt * merge dev/docker/python/requirements.txt with requirements.dev.txt * deduplicate packages in requirements.api.txt and requirements.dev.txt * pinned packages in requirements.dev.txt and removed unused Co-authored-by: Dmitry Shemetov <[email protected]>
08b4589
to
8da9b0f
Compare
looks pretty good to me:
my concerns that remain:
|
those last two commits by me are intended to improve docker image builds by reducing "layers" which will hopefully shorten build times and shrink image footprints. search for "layer" in https://docs.docker.com/develop/develop-images/dockerfile_best-practices/ for more info. |
This is part of #965.
Having our Dockerfiles be partially compiled from the
operations
repo and partially here introduces unnecessary complexity, with no clear benefits (that I can see).In the JIT work, I need to bump the pandas version, so moving the Python
requirements.txt
file from theoperations
repo here lets me do that in just one place.I believe this is the last of our three Docker images to depend on the operations repo:
delphi_database_epidata
is already fully built fromdev/docker/database/epidata/Dockerfile
in this repodelphi_web_epidata
is also fully built fromdevops/Dockerfile
in this repoThis doesn't fully decouple us from
operations
as thesetup.sh
script still copies many old repos to thedelphi_web_python
image. We can consider excising those in a different PR.Prerequisites:
dev
branchdev
Summary
This PR:
delphi_python
image into the Dockerfile for thedelphi_web_python
image in this reporequirements.txt
file from that repo and merged it in withrequirements.dev.txt
setup.sh
file from that repo todev/docker/python
in this reporequirements.txt
torequirements.api.txt
and sorted dependenciesrequirements.api.txt
andrequirements.dev.txt
and removed some unused ones (likescikit-learn
fromrequirements.dev.txt
)requirements.dev.txt
with the latest working versions