From b325d5413ae26f76e8fdf1d3e7c5f55f717c9de8 Mon Sep 17 00:00:00 2001 From: Philip Andrew Wee De Wang <41712275+PhilipWee@users.noreply.github.com> Date: Tue, 27 May 2025 15:40:01 +0800 Subject: [PATCH 1/4] Update Dockerfile --- pkg/config/templates/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/config/templates/Dockerfile b/pkg/config/templates/Dockerfile index 42e1f7d12..dad25a23f 100644 --- a/pkg/config/templates/Dockerfile +++ b/pkg/config/templates/Dockerfile @@ -16,5 +16,5 @@ FROM supabase/storage-api:v1.22.17 AS storage FROM supabase/logflare:1.12.0 AS logflare # Append to JobImages when adding new dependencies below FROM supabase/pgadmin-schema-diff:cli-0.0.5 AS differ -FROM supabase/migra:3.0.1663481299 AS migra +FROM philipandrewweedewang/migra:v1.0.5 AS migra FROM supabase/pg_prove:3.36 AS pgprove From 4b922aa4c6f79bea57f49986af12afb1e604c824 Mon Sep 17 00:00:00 2001 From: Philip Andrew Wee De Wang <41712275+PhilipWee@users.noreply.github.com> Date: Fri, 30 May 2025 09:11:40 +0800 Subject: [PATCH 2/4] fix: switch to slightly more robust migra --- internal/db/diff/migra.go | 2 ++ internal/utils/docker.go | 2 ++ pkg/config/templates/Dockerfile | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/internal/db/diff/migra.go b/internal/db/diff/migra.go index 6c5cc4188..a6d5468f0 100644 --- a/internal/db/diff/migra.go +++ b/internal/db/diff/migra.go @@ -4,6 +4,7 @@ import ( "bytes" "context" _ "embed" + "fmt" "strings" "github.com/docker/docker/api/types/container" @@ -22,6 +23,7 @@ func DiffSchemaMigra(ctx context.Context, source, target string, schema []string // Passing in script string means command line args must be set manually, ie. "$@" args := "set -- " + strings.Join(schema, " ") + ";" cmd := []string{"/bin/sh", "-c", args + diffSchemaScript} + fmt.Printf("%v\n", cmd) var out, stderr bytes.Buffer if err := utils.DockerRunOnceWithConfig( ctx, diff --git a/internal/utils/docker.go b/internal/utils/docker.go index 792ffb3db..b5d5f3ab4 100644 --- a/internal/utils/docker.go +++ b/internal/utils/docker.go @@ -187,6 +187,7 @@ func GetRegistryAuth() string { const defaultRegistry = "public.ecr.aws" func GetRegistry() string { + // return "docker.io" registry := viper.GetString("INTERNAL_IMAGE_REGISTRY") if len(registry) == 0 { return defaultRegistry @@ -239,6 +240,7 @@ func DockerImagePullWithRetry(ctx context.Context, image string, retries int) er func DockerPullImageIfNotCached(ctx context.Context, imageName string) error { imageUrl := GetRegistryImageUrl(imageName) + fmt.Printf(imageUrl) if _, err := Docker.ImageInspect(ctx, imageUrl); err == nil { return nil } else if !client.IsErrNotFound(err) { diff --git a/pkg/config/templates/Dockerfile b/pkg/config/templates/Dockerfile index dad25a23f..2bc4089d5 100644 --- a/pkg/config/templates/Dockerfile +++ b/pkg/config/templates/Dockerfile @@ -16,5 +16,6 @@ FROM supabase/storage-api:v1.22.17 AS storage FROM supabase/logflare:1.12.0 AS logflare # Append to JobImages when adding new dependencies below FROM supabase/pgadmin-schema-diff:cli-0.0.5 AS differ -FROM philipandrewweedewang/migra:v1.0.5 AS migra +FROM philipandrewweedewang/migra:v1.0.6 AS migra +# FROM supabase/migra:3.0.1663481299 AS migra FROM supabase/pg_prove:3.36 AS pgprove From 91509375d8cb92a49e22e773d6d5c5e4aa0720b6 Mon Sep 17 00:00:00 2001 From: Philip Andrew Wee De Wang <41712275+PhilipWee@users.noreply.github.com> Date: Fri, 30 May 2025 09:20:00 +0800 Subject: [PATCH 3/4] chore: cleanup unused comments --- internal/db/diff/migra.go | 2 -- internal/utils/docker.go | 1 - 2 files changed, 3 deletions(-) diff --git a/internal/db/diff/migra.go b/internal/db/diff/migra.go index a6d5468f0..6c5cc4188 100644 --- a/internal/db/diff/migra.go +++ b/internal/db/diff/migra.go @@ -4,7 +4,6 @@ import ( "bytes" "context" _ "embed" - "fmt" "strings" "github.com/docker/docker/api/types/container" @@ -23,7 +22,6 @@ func DiffSchemaMigra(ctx context.Context, source, target string, schema []string // Passing in script string means command line args must be set manually, ie. "$@" args := "set -- " + strings.Join(schema, " ") + ";" cmd := []string{"/bin/sh", "-c", args + diffSchemaScript} - fmt.Printf("%v\n", cmd) var out, stderr bytes.Buffer if err := utils.DockerRunOnceWithConfig( ctx, diff --git a/internal/utils/docker.go b/internal/utils/docker.go index b5d5f3ab4..ba3675562 100644 --- a/internal/utils/docker.go +++ b/internal/utils/docker.go @@ -187,7 +187,6 @@ func GetRegistryAuth() string { const defaultRegistry = "public.ecr.aws" func GetRegistry() string { - // return "docker.io" registry := viper.GetString("INTERNAL_IMAGE_REGISTRY") if len(registry) == 0 { return defaultRegistry From 4ed971446449e8f6a40cc72fc47e7857a4f8c858 Mon Sep 17 00:00:00 2001 From: Philip Andrew Wee De Wang <41712275+PhilipWee@users.noreply.github.com> Date: Fri, 30 May 2025 09:21:20 +0800 Subject: [PATCH 4/4] chore: more cleanup of pritn statements --- internal/utils/docker.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/utils/docker.go b/internal/utils/docker.go index ba3675562..792ffb3db 100644 --- a/internal/utils/docker.go +++ b/internal/utils/docker.go @@ -239,7 +239,6 @@ func DockerImagePullWithRetry(ctx context.Context, image string, retries int) er func DockerPullImageIfNotCached(ctx context.Context, imageName string) error { imageUrl := GetRegistryImageUrl(imageName) - fmt.Printf(imageUrl) if _, err := Docker.ImageInspect(ctx, imageUrl); err == nil { return nil } else if !client.IsErrNotFound(err) {