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

change to set the locale via snippet and add support for debian #252

Merged
merged 1 commit into from
Mar 14, 2016

Conversation

tfoote
Copy link
Member

@tfoote tfoote commented Mar 14, 2016

debian does not have locales in the base image.

This is to fix builds like this: http://54.183.26.131:8080/job/Ksrc_debianjessie__visualization_msgs__debian_jessie__source/193/console

@tfoote tfoote self-assigned this Mar 14, 2016
'snippet/setup_locale.Dockerfile.em',
os_name=os_name,
os_code_name=os_code_name,
timezone=timezone if timezone else None,
Copy link
Member

Choose a reason for hiding this comment

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

Have you tried to expand this template which doesn't pass in a timezone variable?

Copy link
Member Author

Choose a reason for hiding this comment

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

I can't test it since it's available in all templates here i'll remove the conditional loading since you're right this won't work with timezone unset.

@tfoote
Copy link
Member Author

tfoote commented Mar 14, 2016

updated to not be conditional on timezone since it's set by the wrapper here

@dirk-thomas
Copy link
Member

LGTM. Please squash before the merge.

@tfoote tfoote force-pushed the locale_for_debian branch from 759fca4 to 5106e70 Compare March 14, 2016 19:11
tfoote added a commit that referenced this pull request Mar 14, 2016
change to set the locale via snippet and add support for debian
@tfoote tfoote merged commit dff5fb7 into master Mar 14, 2016
@tfoote tfoote deleted the locale_for_debian branch March 14, 2016 19:15
@tfoote
Copy link
Member Author

tfoote commented Mar 14, 2016

Fixup for hard coded os versions: be01b7f

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.

2 participants