Setuptools installer, Dockerfile, and updated BuildConfig #42
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Uses package version of calrissian and cwltool
- Includes an imagestream that imports python:3.6 from docker hub, since otherwise openshift will use a centos/rhel-flavored base image. apt-get install nodejs doesnt work there - config was generated from oc new-build
dleehr
changed the title
johnbradley
approved these changes
Feb 6, 2019
openshift/BuildConfig.yaml
Outdated
| @@ -33,16 +33,11 @@ items: | |||
| resources: {} | |||
| source: | |||
| git: | |||
| ref: master | |||
| uri: https://github.com/Duke-GCB/calrissian | |||
| ref: 40-packaging | |||
There was a problem hiding this comment.
FYI: You probably want to make this master before committing.
|
|
||
| def version(): | ||
| return 'Calrissian-dev' | ||
| return 'calrissian {} (cwltool {})'.format(calrissian_version(), cwltool_version()) |
There was a problem hiding this comment.
I tried calrissian --version and it just printed help. I expected to see version info like cwltool does.
There was a problem hiding this comment.
Moved to #43. This happens because calrissian checks for its required args and exits with help before passing the args to cwltool's main(). --version isn't checked until inside cwltool's main(), so I need to duplicate that handling in calrissian.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
calrissianinstead ofpython -m ...version.pyto report the version of calrissian and cwltoolpython:3.6(includes nodejs)Dockerfileinstead of a source-to-image build.calrissianCLI script ascommandand arguments asargs.Fixes #40