From cbee752dc18c70f1aefe4fd9f507efabc537f034 Mon Sep 17 00:00:00 2001 From: Andreas Salhus Bakseter <141913422+baksetercx@users.noreply.github.com> Date: Tue, 21 Jan 2025 15:34:49 +0100 Subject: [PATCH 1/2] Fix using two tags when running docker inspect --- pkg/deploy/deploy.go | 4 ++-- pkg/deploy/deploy_test.go | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/deploy/deploy.go b/pkg/deploy/deploy.go index 1146ec7..8fa69df 100644 --- a/pkg/deploy/deploy.go +++ b/pkg/deploy/deploy.go @@ -433,7 +433,7 @@ func setupKubernetes( } func dockerInspectCommand( - imageName string, + imageNameWithTag string, runOptions *command.RunOptions, ) command.Output { return command.Run( @@ -442,7 +442,7 @@ func dockerInspectCommand( "inspect", "--format", "{{index .RepoDigests 0}}", - imageName+":"+build.DefaultCacheTag, + imageNameWithTag, ), runOptions, ) diff --git a/pkg/deploy/deploy_test.go b/pkg/deploy/deploy_test.go index b364e25..9b10290 100644 --- a/pkg/deploy/deploy_test.go +++ b/pkg/deploy/deploy_test.go @@ -4,13 +4,14 @@ import ( "strings" "testing" + "github.com/3lvia/cli/pkg/build" "github.com/3lvia/cli/pkg/command" ) func TestDockerInspectCommand(t *testing.T) { t.Parallel() - const imageName = "ghcr.io/3lvia/core/demo-api" + const imageName = "ghcr.io/3lvia/core/demo-api" + build.DefaultCacheTag expectedCommandString := strings.Join( []string{ @@ -18,7 +19,7 @@ func TestDockerInspectCommand(t *testing.T) { "inspect", "--format", "{{index .RepoDigests 0}}", - imageName + ":latest-cache", + imageName, }, " ", ) From 1b110efae90351427a24ab74ebe039e721608d8d Mon Sep 17 00:00:00 2001 From: Andreas Salhus Bakseter <141913422+baksetercx@users.noreply.github.com> Date: Tue, 21 Jan 2025 15:35:08 +0100 Subject: [PATCH 2/2] 0.29.1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index ae6dd4e..25939d3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.29.0 +0.29.1