Skip to content

Commit b92da73

Browse files
committed
Remove distroless from docker manifest as we can't pull from gcr.io
1 parent fc0425a commit b92da73

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

lib/generate_docker_manifest.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ def fill_image_template_ubuntu(git_dir, dockerfiles_subdir, major, dockerpath, d
6666
return Template(template_image).substitute(tags=", ".join(tags), git_commit=git_commit, directory=str.format('{0}/{1}/{2}', dockerfiles_subdir, major, dockerpath))
6767

6868
template_image_distroless = '''Tags: ${tags}
69+
Architectures: amd64, arm64, ppc64le
6970
GitCommit: ${git_commit}
7071
Directory: ${directory}'''
7172

@@ -131,10 +132,10 @@ def main(argv=None):
131132
images.append(fill_image_template_ubuntu(git_dir, dockerfiles_subdir, release, 'ubuntu/jdk-headless', 'jdk-headless-ubuntu', isLatest, isLatestLts))
132133
images.append(fill_image_template_ubuntu(git_dir, dockerfiles_subdir, release, 'ubuntu/jdk', 'jdk-ubuntu', isLatest, isLatestLts))
133134

134-
images.append(fill_image_template_distroless(git_dir, dockerfiles_subdir, release, 'distroless/debian11/latest', 'distroless-debian11', isLatest, isLatestLts))
135-
images.append(fill_image_template_distroless(git_dir, dockerfiles_subdir, release, 'distroless/debian11/nonroot', 'distroless-debian11-nonroot', isLatest, isLatestLts))
136-
images.append(fill_image_template_distroless(git_dir, dockerfiles_subdir, release, 'distroless/debian11/debug', 'distroless-debian11-debug', isLatest, isLatestLts))
137-
images.append(fill_image_template_distroless(git_dir, dockerfiles_subdir, release, 'distroless/debian11/debug-nonroot', 'distroless-debian11-debug-nonroot', isLatest, isLatestLts))
135+
#images.append(fill_image_template_distroless(git_dir, dockerfiles_subdir, release, 'distroless/debian11/latest', 'distroless-debian11', isLatest, isLatestLts))
136+
#images.append(fill_image_template_distroless(git_dir, dockerfiles_subdir, release, 'distroless/debian11/nonroot', 'distroless-debian11-nonroot', isLatest, isLatestLts))
137+
#images.append(fill_image_template_distroless(git_dir, dockerfiles_subdir, release, 'distroless/debian11/debug', 'distroless-debian11-debug', isLatest, isLatestLts))
138+
#images.append(fill_image_template_distroless(git_dir, dockerfiles_subdir, release, 'distroless/debian11/debug-nonroot', 'distroless-debian11-debug-nonroot', isLatest, isLatestLts))
138139

139140
with open(manifest, 'w') as manifest_file:
140141
manifest_file.write(Template(template_manifest).substitute(images='\n\n'.join(images)))

0 commit comments

Comments
 (0)