Обновить build.py
This commit is contained in:
parent
8c4c43e20c
commit
42cd5492ad
6
build.py
6
build.py
@ -230,7 +230,7 @@ class DockerBuilder:
|
|||||||
) -> str:
|
) -> str:
|
||||||
if self.registry:
|
if self.registry:
|
||||||
registry = self.registry.rstrip("/") + "/"
|
registry = self.registry.rstrip("/") + "/"
|
||||||
alt_image = "alt/alt"
|
alt_image = "base/alt"
|
||||||
else:
|
else:
|
||||||
registry = ""
|
registry = ""
|
||||||
alt_image = "alt"
|
alt_image = "alt"
|
||||||
@ -307,7 +307,7 @@ class DockerBuilder:
|
|||||||
f"{from_image['organization']}/{from_image['name']}"
|
f"{from_image['organization']}/{from_image['name']}"
|
||||||
)
|
)
|
||||||
elif distrolessfile.exists():
|
elif distrolessfile.exists():
|
||||||
requires.add("alt/distroless-builder")
|
requires.add("base/distroless-builder")
|
||||||
raw_from = self.distrolesses[canonical_name].raw_from
|
raw_from = self.distrolesses[canonical_name].raw_from
|
||||||
from_ = self.render_template(raw_from, self.organization)
|
from_ = self.render_template(raw_from, self.organization)
|
||||||
if match := re.match(self.image_re, from_):
|
if match := re.match(self.image_re, from_):
|
||||||
@ -345,7 +345,7 @@ class DockerBuilder:
|
|||||||
def distroless_build(self, image: Image, arches):
|
def distroless_build(self, image: Image, arches):
|
||||||
def distroless_build_arch(arch, manifest):
|
def distroless_build_arch(arch, manifest):
|
||||||
distroless_builder = self.render_full_tag(
|
distroless_builder = self.render_full_tag(
|
||||||
Image("alt/distroless-builder"), self.branch
|
Image("base/distroless-builder"), self.branch
|
||||||
)
|
)
|
||||||
distroless = self.distrolesses[image.canonical_name]
|
distroless = self.distrolesses[image.canonical_name]
|
||||||
distroless.render_arch_branch(arch, self.branch)
|
distroless.render_arch_branch(arch, self.branch)
|
||||||
|
Loading…
Reference in New Issue
Block a user