Use recently built image instead of latest for src #2649
Conversation
This file contains hidden or 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
| } | ||
|
|
||
| func (c *apiClient) LocalImageID(ctx context.Context, ref string) (string, error) { | ||
| console.Debugf("=== APIClient.LocalImageTag %s", ref) |
There was a problem hiding this comment.
I was expecting this debug line to say APIClient.LocalImageID 🤔
There was a problem hiding this comment.
I haven't found a way to run this that produces the incorrect hash message 🤔
| func BuildAddLabelsAndSchemaToImage(ctx context.Context, dockerClient command.Command, image string, labels map[string]string, bundledSchemaFile string, progressOutput string) error { | ||
| dockerfile := "FROM " + image + "\n" | ||
| dockerfile += "COPY " + bundledSchemaFile + " .cog\n" | ||
| if strings.HasPrefix("image", "r8.im") { |
There was a problem hiding this comment.
did you mean?
Suggested change
| if strings.HasPrefix("image", "r8.im") { | |
| if strings.HasPrefix(image , "r8.im") { |
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.
Summary
We have been investigating a caching issue that has lead to versions of cog including an old version of the
srcfolder when runningcog buildorcog pushon a model that already has a version. We are fairly sure that in certain circumstances, when theFROM r8.im/<username>/<model-name>command is run, it is pulling the latest from the upstream registry instead of using the recently built image from the local machine. To disambiguate, we should directly pass the SHA of the image on the local machine instead of letting docker just look forlatest, as it would do by default.Test Plan
A script,
./script/test-e2e-rebuild, was introduced, that simply makes a small change to thepredict.pyfunction and tries to rebuild the image. It then checks that the hash of thepredict.pybuilt into the docker image is the same as the one in thepredict.pysource directory for building the image.To verify the correctness of this change, build
cogfrom source on themainbranch. Then checkout this branch and run the test. The exit code of the script should be 1. Rebuildcogfrom this branch, and re-run the test. The exit code of the script should be 0.