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.

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

SingularityService configuration & DC/OS support #1137

Merged
merged 2 commits into from Aug 24, 2016

Conversation

@martinstuder
Copy link
Contributor

martinstuder commented Jul 12, 2016

This pull request enables additional configuration of the singularityservice docker container to take place via environment variables. In addition, this pull request adds supporting Singularity images for a potential Singularity DC/OS package.

@@ -15,7 +15,12 @@ DEFAULT_URI_BASE="http://${SINGULARITY_HOSTNAME:=localhost}:${SINGULARITY_PORT:=

args+=( -Xmx${SINGULARITY_MAX_HEAP:-512m} )
args+=( -Djava.net.preferIPv4Stack=true )
args+=( -Ddw.server.applicationContextPath="${SINGULARITY_APP_CTX:=/singularity}" )

This comment has been minimized.

@tpetr

tpetr Jul 25, 2016 Member

we've got at least one other environment variable floating around that serves a similar purpose (see: https://github.com/HubSpot/Singularity/blob/master/SingularityUI/gulpfile.js#L17) -- @ssalinas do you think it'd be good to consolidate here?

This comment has been minimized.

@ssalinas

ssalinas Jul 25, 2016 Member

So, we need two different ones. There is the app context path, and the uri base (host + path that the ui uses for config). We can reuse the SINGULARITY_UI_BASE var that we use to calculate the default uri base (or set them both to SINGULARITY_APP_CTX which might even make more sense)

This comment has been minimized.

@ssalinas

ssalinas Aug 24, 2016 Member

Given the changes in #1236 , think the config and vars can stay as-is. Tested this out and going to merge though our branches 👍

@tpetr
Copy link
Member

tpetr commented Jul 25, 2016

LGTM aside from comment above, thanks!

@ssalinas ssalinas modified the milestone: 0.10.0 Jul 29, 2016
@ssalinas ssalinas modified the milestones: 0.10.0, 0.11.0 Aug 19, 2016
@ssalinas ssalinas merged commit eba6b92 into HubSpot:master Aug 24, 2016
0 of 2 checks passed
0 of 2 checks passed
continuous-integration/travis-ci/pr The Travis CI build failed
Details
continuous-integration/travis-ci/push The Travis CI build failed
Details
@ssalinas ssalinas removed hs_qa labels Aug 24, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.