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

Add support for patch_base_image when not running locally #1939

Merged
merged 4 commits into from
May 26, 2023

Conversation

jprokos26
Copy link
Contributor

@jprokos26 jprokos26 commented May 25, 2023

Addresses #1930

Searches for patch_base_image in more than one place:

  1. Check if file exists in module path
  2. Check if file exists in armory.paths.runtime_paths().cwd
  3. Check if supplied patch_base_image is actually a url to an image we can download
    Else fail

@jprokos26 jprokos26 changed the base branch from master to develop May 25, 2023 13:12
@jprokos26
Copy link
Contributor Author

Whenever I tried to pip install -e . with these changes and move to a different directory when I launch the docker container the armory being run does not have these changes so I was unable to test that the cwd gets mapped properly to runtime_paths().cwd when running as a pip installed package not locally.

@mwartell mwartell mentioned this pull request May 25, 2023
2 tasks
Co-authored-by: Christopher Woodall <christopher.woodall@twosixtech.com>
Copy link
Contributor

@christopherwoodall christopherwoodall left a comment

Choose a reason for hiding this comment

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

LGTM!

@jprokos26 jprokos26 merged commit c2690d6 into twosixlabs:develop May 26, 2023
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