-
Notifications
You must be signed in to change notification settings - Fork 284
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM! Nice cleanup!
Will approve after the 2 tests are fixed ( or an issue is added to the # fixme )
@maaktweluit Right, these tests are also failing for me on develop so I just removed "fixme" and see what happens. I might have broken environment :) |
Codecov Report
@@ Coverage Diff @@
## develop #3741 +/- ##
==========================================
+ Coverage 87.6% 87.6% +<.01%
==========================================
Files 214 214
Lines 18971 18892 -79
==========================================
- Hits 16619 16551 -68
+ Misses 2352 2341 -11 |
@Krigpl Why has this already been merged? |
Why not? |
https://hub.docker.com/r/golemfactory/blender/dockerfile
|
@@ -190,7 +188,7 @@ def _run_docker_job(self) -> Optional[int]: | |||
|
|||
params = dict( | |||
image=self.image, | |||
script_src=self.src_code, | |||
script_filepath=self.extra_data['script_filepath'], |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why script_filepath is part of extra_data ?
As far as I know, in extra_data are all parameters needed inside docker container. script_filepath is used only as command to run docker, so we don't need to pass it to params.json.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, this is a slight abuse of extra_data
, but there were no better alternatives at the time. Ideally src_code
from ctd would be replaced with script_filepath
(or even better with some environment config dict, e.g. to include argv as well) but this requires changes to Golem-Messages so this will be done separately.
Stop supporting
src_code
as it was before.The path to the script is passed through
extra_data
.Blender and image_metrics images still require an update on Docker hub (will push them after initial approval).