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

added support for defining prefixes as : in the fs #14

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 10 additions & 5 deletions static-container-registry.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,13 @@ def create_config(root, server_root, name_prefix, with_constants=True,
}

yield '''
location = /v2/{name_prefix:s}{name:s}/tags/list {{
location = /v2/{name_prefix:s}{sname:s}/tags/list {{
types {{ }} default_type "application/json";
return 200 '{payload:s}';
}}
'''.format(
name=name,
sname=name.replace(":","/"),
name_prefix=name_prefix.lstrip('/'),
payload=json.dumps(tag_list),
)
Expand All @@ -131,7 +132,7 @@ def create_config(root, server_root, name_prefix, with_constants=True,
hexdigest = digest.hexdigest()

yield '''
location = "/v2/{name_prefix:s}{name:s}/manifests/{tag:s}" {{
location = "/v2/{name_prefix:s}{sname:s}/manifests/{tag:s}" {{
alias {server_root:s}/{name:s}/{tag:s}/;
types {{ }} default_type "application/vnd.docker.distribution.manifest.v2+json";
add_header 'Docker-Content-Digest' 'sha256:{digest:s}';
Expand All @@ -140,6 +141,7 @@ def create_config(root, server_root, name_prefix, with_constants=True,
}}
'''.format(
name=name,
sname=name.replace(":","/"),
tag=tag,
name_prefix=name_prefix.lstrip('/'),
digest=hexdigest,
Expand All @@ -148,7 +150,7 @@ def create_config(root, server_root, name_prefix, with_constants=True,

if hexdigest not in seen_digests:
yield '''
location = "/v2/{name_prefix:s}{name:s}/manifests/sha256:{digest:s}" {{
location = "/v2/{name_prefix:s}{sname:s}/manifests/sha256:{digest:s}" {{
alias {server_root:s}/{name:s}/{tag:s}/;
types {{ }} default_type "application/vnd.docker.distribution.manifest.v2+json";
add_header 'Docker-Content-Digest' 'sha256:{digest:s}';
Expand All @@ -157,30 +159,33 @@ def create_config(root, server_root, name_prefix, with_constants=True,
}}
'''.format(
name=name,
sname=name.replace(":","/"),
tag=tag,
name_prefix=name_prefix.lstrip('/'),
digest=hexdigest,
server_root=server_root,
)
else:
yield '''
# Digest for "{name:s}:{tag:s}" already served
# Digest for "{sname:s}:{tag:s}" already served
'''.format(
name=name,
sname=name.replace(":","/"),
tag=tag,
)

seen_digests.add(hexdigest)

yield '''
location ~ "/v2/{name_prefix:s}{name:s}/blobs/sha256:([a-f0-9]{{64}})" {{
location ~ "/v2/{name_prefix:s}{sname:s}/blobs/sha256:([a-f0-9]{{64}})" {{
alias {server_root:s}/{name:s}/;
try_files {paths:s} =404;
}}
'''.format(
name_prefix=name_prefix.lstrip('/'),
server_root=server_root,
name=name,
sname=name.replace(":","/"),
paths=' '.join('{tag:s}/$1'.format(tag=tag) for tag in sorted(tags)),
)

Expand Down