diff options
| author | jade <lix@jade.fyi> | 2024-06-15 02:38:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@localhost> | 2024-06-15 02:38:09 +0000 |
| commit | e1059bfa34b2f9e780ae2d13021c6bef66f34599 (patch) | |
| tree | 887869e9cdc90df1eeeec59fb31d93ac36ce39c2 /releng/docker_assemble.py | |
| parent | 068576042b3b58f8180b24a36c07199a1a3fd380 (diff) | |
| parent | d5c670ad0175fe2a9279784f2acacae4ba7b3828 (diff) | |
Merge changes from topic "releng" into main
* changes:
releng: add sha256 for the manual tarball
releng: fix upload of multiarch images to forgejo
releng: fix git checking
releng: fix logging inside interactive xonsh
releng: support multiple systems
version: update to 2.90.0-rc1
Diffstat (limited to 'releng/docker_assemble.py')
| -rw-r--r-- | releng/docker_assemble.py | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/releng/docker_assemble.py b/releng/docker_assemble.py index ef1d8c4e6..d5b47c328 100644 --- a/releng/docker_assemble.py +++ b/releng/docker_assemble.py @@ -49,8 +49,8 @@ if DEBUG_REQUESTS: # fix that. Thus, a little bit of homebrew containers code. # # Essentially what we are doing in here is splatting a bunch of images into the -# registry without tagging them (except as "temp", due to podman issues), then -# simply sending a new composite manifest ourselves. +# registry without tagging them (with a silly workaround to skopeo issues), +# then simply sending a new composite manifest ourselves. DockerArchitecture = Literal['amd64'] | Literal['arm64'] MANIFEST_MIME = 'application/vnd.oci.image.manifest.v1+json' @@ -100,14 +100,6 @@ class OCIIndex: } -def docker_architecture_from_nix_system(system: str) -> DockerArchitecture: - MAP = { - 'x86_64-linux': 'amd64', - 'aarch64-linux': 'arm64', - } - return MAP[system] # type: ignore - - @dataclasses.dataclass class TaggingOperation: manifest: OCIIndex @@ -284,7 +276,7 @@ class AuthState: 'Authorization': 'Basic ' + creds }).json() token = resp['token'] - self.token_cache[service] = token + self.token_cache[authority] = token return token def find_credential_for(self, image_path: str): |