UIP-49 modify dockerfile #93
Conversation
lib/biokbase/log.py
Outdated
There was a problem hiding this comment.
This is most of the PR. Copy-pasted from another repo, so it can be included here directly.
Dockerfile
Outdated
| FROM kbase/sdkbase2:python | ||
| MAINTAINER KBase Developer | ||
| FROM python:3.12-slim | ||
| LABEL MAINTAINER KBase Developer |
There was a problem hiding this comment.
LABEL maintainer="KBase Developer"
Dockerfile
Outdated
| RUN pip install --upgrade pip | ||
| RUN pip install -r requirements.txt |
There was a problem hiding this comment.
could combine into a single command
| @@ -0,0 +1,27 @@ | |||
| [NarrativeService] | |||
| kbase-endpoint = https://ci.kbase.us/services | |||
There was a problem hiding this comment.
I'm going to guess that a lot of these aren't used...
I've been contemplating about migrating to a model where the config file just provides the base url (instead of all these derivative URLs) and any extra stuff, like scratch dir, etc., and there's a config.py that generates the various necessary endpoint URLs from the base url. Main advantages would be being able to reuse the config generator in multiple projects, not having to remember the suffixes if you accidentally delete the test or real deploy.cfg, and a more compact config file with less repetition. Hmmm.
There was a problem hiding this comment.
I bet you're right. I'd rather ferret those out when picking through the tests, though, as they seem reasonably benign here.
test/run_tests.sh
Outdated
| # export KB_DEPLOYMENT_CONFIG=$script_dir/../deploy.cfg | ||
| export KB_AUTH_TOKEN=`cat /kb/module/work/token` | ||
| export PYTHONPATH=$script_dir/../lib:$PATH:$PYTHONPATH | ||
| # cd $script_dir/../test | ||
| # python -m nose --with-coverage --cover-package=NarrativeService --cover-html --cover-html-dir=/kb/module/work/cover_html --nocapture . |
There was a problem hiding this comment.
do you want to remove these comments?
As done in StaticNarrative and elsewhere, this updates the Dockerfile to use the Python 3.12 image, and a little bit of compatilbility fixing in the test suite.
Note that tests are (still) going to fail pretty hard right now due to some mish-mash between mocking and contacting other services. That'll be addressed in a patch to split between unit and integration tests.