Allow attaching tags to models; fix errors when pushing existing content to storage #8
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add support for applying a tag when building via the --tag|-t flag. If
supplied, the build will be labelled with the tag.
As an early implementation, this will store the model's blobs _in a
different path_ than the default, matching the tag. For a tag like
myregistry.com/my-organization/my-repo:my-tag
and a root config path of $HOME/.jozu/, blobs will be stored in
$HOME/.jozu/storage/myregistry.com/my-organization/my-repo/<store>
This means that building the same model with different tags will
duplicate storage for now; this should be fixed in the future.
Summary of changes in this commit:
* Storage path is no longer .jozuStore appended to whatever config path
is; instead Storage uses whatever path is provided and build command
chooses 'storage' subdirecto of the config path
* This is required to allow all tagged repos to be subdirectories of
one base 'storage' directory
* If no tag is provided, blobs are stored in $JOZU_HOME/storage/ as
before (change: storage instead of .jozuStore)
* If a tag is provided, it is applied as an annotation according to the
OCI spec, using annotation 'org.opencontainers.image.ref.name'
* If a tag is provided but does not have a hostname, the default value
of localhost is used.
Avoid error when pushing e.g. an already-existing blob into the local storage.
gorkem
reviewed
Feb 10, 2024
pkg/cmd/build/build.go
Outdated
| return options, nil | ||
| } | ||
|
|
||
| func (flags *BuildFlags) AddFlags(cmd *cobra.Command) { | ||
| cmd.Flags().StringVarP(&flags.ModelFile, "file", "f", "", "Path to the model file") | ||
| cmd.Flags().StringVarP(&flags.FullTagRef, "tag", "t", "", "Tag for the model") |
There was a problem hiding this comment.
Should we make this a StringArray which is the case for docker build -t command?
There was a problem hiding this comment.
Done -- took a bit more work than expected, but also revealed that I was doing tagging wrong :)
Fix how tagging is done; instead of tagging manifests themselves, we need to tag their entries in the index.json. Additionally, add support for multiple tags specified at once, e.g. jmm build -t myreg/myrepo:tag1,tag2,tag3
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Mainly, the goal of this PR is allow adding tags to builds:
This is required for
jmm pushto make senseIn order to make this work, however, it is necessary to make some changes to how artifacts are stored:
.jozu/storage)~/.local/...index.jsonnow refers to the elements of one repository (c.f. image repositories; library/registry and library/registry2 are different repositories). This means the storage dir has multipleindex.jsons. As far as I can tell, this is what is expected by the OCI image spec.If a tag is specified without a registry (e.g. my-repo instead of localhost:5000/my-repo), the default of
localhostis used. For now, this will break if you use a tag likemy/repo;mywill be considered the registry.I also fixed the bug where running build twice would fail becuase artifacts exist.