mirror of
https://github.com/jupyter/docker-stacks.git
synced 2025-10-08 02:24:04 +00:00
Merge tags and create multi-platform images (#1789)
* Merge tags and create multi-platform images * Add new files :) * Provide images * Fix * Fix * Use the same naming style as python for the images * Fix docker image rmi command * Use plumbum.FG * Fix * Add missing path * Few merging fixes * Add pushing manifests * Add missing path * Add arch to apply tags * Use platform word * Remove unused step * Merge tags for tensorflow as well * Do not use print * Make merge_tags work when image doesn't exist * Add logs * Add icon * Add tensorflow-notebook workaround * Unify platform usage * Remove unused function * Fix * Update docs
This commit is contained in:
@@ -4,14 +4,13 @@
|
||||
import argparse
|
||||
import datetime
|
||||
import logging
|
||||
import platform
|
||||
from pathlib import Path
|
||||
|
||||
from docker.models.containers import Container
|
||||
|
||||
from tagging.docker_runner import DockerRunner
|
||||
from tagging.get_platform import get_platform
|
||||
from tagging.get_taggers_and_manifests import get_taggers_and_manifests
|
||||
from tagging.get_tags_prefix import get_tags_prefix
|
||||
from tagging.git_helper import GitHelper
|
||||
from tagging.manifests import ManifestHeader, ManifestInterface
|
||||
|
||||
@@ -68,11 +67,6 @@ def write_manifest_file(
|
||||
(manifest_dir / f"{filename}.md").write_text(markdown_content)
|
||||
|
||||
|
||||
def get_file_prefix() -> str:
|
||||
machine = platform.machine()
|
||||
return "amd64" if machine == "x86_64" else "aarch64"
|
||||
|
||||
|
||||
def write_manifest(
|
||||
short_image_name: str,
|
||||
owner: str,
|
||||
@@ -84,13 +78,15 @@ def write_manifest(
|
||||
|
||||
image = f"{owner}/{short_image_name}:latest"
|
||||
|
||||
file_prefix = get_file_prefix()
|
||||
file_prefix = get_platform()
|
||||
commit_hash_tag = GitHelper.commit_hash_tag()
|
||||
filename = f"{file_prefix}-{short_image_name}-{commit_hash_tag}"
|
||||
|
||||
with DockerRunner(image) as container:
|
||||
tags_prefix = get_tags_prefix()
|
||||
all_tags = [tags_prefix + tagger.tag_value(container) for tagger in taggers]
|
||||
tags_prefix = get_platform()
|
||||
all_tags = [
|
||||
tags_prefix + "-" + tagger.tag_value(container) for tagger in taggers
|
||||
]
|
||||
write_build_history_line(
|
||||
short_image_name, owner, hist_line_dir, filename, all_tags
|
||||
)
|
||||
|
Reference in New Issue
Block a user