Skip to content

Remove "repositories" from the Docker clue list #32 #33

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jun 10, 2021
Merged

Remove "repositories" from the Docker clue list #32 #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8425735
Remove "repositories" from the Docker clue list #32
tdruez Jun 10, 2021
3e65182
Find Docker format without "repositories" #32
pombredanne Jun 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Changelog
=========

v21.6.10
--------

This is a minor release with bug fixes.

v21.6.4
--------

Expand Down
2 changes: 1 addition & 1 deletion src/container_inspector/image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,7 @@ def find_format(extracted_location):
- oci (which is for the OCI format)
"""
clue_files_by_image_format = {
'docker': ('manifest.json', 'repositories',),
'docker': ('manifest.json',),
'oci': ('blobs', 'index.json', 'oci-layout',)
}

Expand Down
Binary file added tests/data/image/mini-image_from_scratch-2.0.tar
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions tests/test_image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,3 +140,8 @@ def test_Image_find_format(self):
test_arch = self.get_test_loc('image/she-image_from_scratch-1.0.tar')
test_dir = self.extract_test_tar(test_arch)
assert Image.find_format(test_dir) == 'docker'

def test_Image_find_format_finds_Docker_images_without_repositories(self):
test_arch = self.get_test_loc('image/mini-image_from_scratch-2.0.tar')
test_dir = self.extract_test_tar(test_arch)
assert Image.find_format(test_dir) == 'docker'