-
Notifications
You must be signed in to change notification settings - Fork 78
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
Added install pkgs extension #295
Open
agyoungs
wants to merge
2
commits into
osrf:main
Choose a base branch
from
agyoungs:install-pkgs-extension
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,4 +5,5 @@ deb_dist | |
*.pyc | ||
.coverage | ||
build | ||
rocker_venv | ||
rocker_venv | ||
.vscode |
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
import em | ||
import pkgutil | ||
from rocker.extensions import RockerExtension | ||
|
||
|
||
class InstallPkgs(RockerExtension): | ||
|
||
name = 'install_pkgs' | ||
|
||
@classmethod | ||
def get_name(cls): | ||
return cls.name | ||
|
||
def __init__(self): | ||
self._env_subs = None | ||
self.name = InstallPkgs.get_name() | ||
|
||
def precondition_environment(self, cli_args): | ||
pass | ||
|
||
def validate_environment(self, cli_args): | ||
pass | ||
|
||
def get_preamble(self, cli_args): | ||
return '' | ||
|
||
def get_snippet(self, cli_args): | ||
pkgs = set(cli_args['install_pkgs']) | ||
args = {'packages': list(pkgs)} | ||
|
||
snippet = pkgutil.get_data( | ||
'rocker', 'templates/{}_snippet.Dockerfile.em'.format(self.name)).decode('utf-8') | ||
|
||
return em.expand(snippet, args) | ||
|
||
@staticmethod | ||
def register_arguments(parser, defaults={}): | ||
parser.add_argument('--install-pkgs', | ||
nargs='+', | ||
help='Installs specified packages in container') | ||
|
||
# todo add argument to install common development packages by category | ||
# (e.g dev, debug, viz, sim, etc) that are not in the base image |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
# User specified additional packages | ||
RUN export DEBIAN_FRONTEND=noninteractive; \ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This template only works for debian like systems. It should be documented. |
||
apt-get update \ | ||
@# List each package specified in packages list | ||
&& apt-get install -y @[for package in packages] @package @[end for] \ | ||
# Clean | ||
&& apt-get clean |
Oops, something went wrong.
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.
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.
This should at least validate the environment here is debian if this will only work for debian packages.
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.
Does
validate_environment
get called anywhere? It seems like it's not used unless I'm missing somethingThere 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.
Well that's a regression. It should be being validated at the build stage. It looks like that was lost along the way.