particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sources/skopeo: add storage location

Browse source 
For local images copied from an image store other than the default, we
need to be able to specify the `storage-location`. This commit enables
this functionality.

Jira: https://issues.redhat.com/browse/HMS-3235
This commit is contained in:
Gianluca Zuccarelli 2023-12-13 21:34:56 +00:00 • committed by Achilleas Koutsou
parent ac5653d9f1
commit a2b2a02add
2 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
sources/org.osbuild.skopeo
View file

@ -60,6 +60,10 @@ SCHEMA = """
"enum": ["docker", "containers-storage" ],
"description": "The containers transport from which to copy the container",
"default": "docker"
},
"storage-location": {
"type": "string",
"description": "The location of the local containers storage"
}
}
}
@ -103,13 +107,19 @@ class SkopeoSource(sources.SourceService):
digest = image["digest"]
tls_verify = image.get("tls-verify", True)
transport = image.get("containers-transport", DOCKER_TRANSPORT)
location = image.get("storage-location", "")
with tempfile.TemporaryDirectory(prefix="tmp-download-", dir=self.cache) as tmpdir:
archive_dir = os.path.join(tmpdir, "container-archive")
os.makedirs(archive_dir)
os.chmod(archive_dir, 0o755)
reference = f"{imagename}@{digest}"
# Skopeo will read the default storage path from the
# /etc/containers/storage.conf unless storage-location
# is provided. See:
# https://github.com/containers/storage/blob/acbb93bb802702bc171b9987a47a9b713c280d38/types/options.go#L53
specifier = location if location == "" else f"[overlay@{location}]"
reference = f"{specifier}{imagename}@{digest}"
source = self.get_source(transport, reference)
# We use the dir format because it is the most powerful in terms of feature support and is the closest to a

12
sources/org.osbuild.skopeo-index
View file

@ -47,6 +47,10 @@ SCHEMA = """
"enum": ["docker", "containers-storage" ],
"description": "The containers transport from which to copy the container",
"default": "docker"
},
"storage-location": {
"type": "string",
"description": "The location of the local containers storage"
}
}
}
@ -87,13 +91,19 @@ class SkopeoIndexSource(sources.SourceService):
imagename = image["name"]
tls_verify = image.get("tls-verify", True)
transport = image.get("containers-transport", DOCKER_TRANSPORT)
location = image.get("storage-location", "")
with tempfile.TemporaryDirectory(prefix="tmp-download-", dir=self.cache) as tmpdir:
archive_dir = os.path.join(tmpdir, "index")
os.makedirs(archive_dir)
os.chmod(archive_dir, 0o755)
reference = f"{imagename}@{digest}"
# Skopeo will read the default storage path from the
# /etc/containers/storage.conf unless storage-location
# is provided. See:
# https://github.com/containers/storage/blob/acbb93bb802702bc171b9987a47a9b713c280d38/types/options.go#L53
specifier = location if location == "" else f"[overlay@{location}]"
reference = f"{specifier}{imagename}@{digest}"
source = self.get_source(transport, reference)
destination = f"dir:{archive_dir}"