Skip to content

SingularityService configuration & DC/OS support#1137

Merged
ssalinas merged 2 commits into
HubSpot:masterfrom
martinstuder:dcos_support
Aug 24, 2016
Merged

SingularityService configuration & DC/OS support#1137
ssalinas merged 2 commits into
HubSpot:masterfrom
martinstuder:dcos_support

Conversation

@martinstuder

Copy link
Copy Markdown
Contributor

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.


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

@tpetr tpetr Jul 25, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

tpetr commented Jul 25, 2016

Copy link
Copy Markdown
Contributor

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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants