diff --git a/internal/db/reset/reset_test.go b/internal/db/reset/reset_test.go index 9eeb0f150f..839ccdc8b6 100644 --- a/internal/db/reset/reset_test.go +++ b/internal/db/reset/reset_test.go @@ -38,7 +38,6 @@ func TestResetCommand(t *testing.T) { t.Run("seeds storage after reset", func(t *testing.T) { utils.DbId = "test-reset" - utils.ConfigId = "test-config" utils.Config.Db.MajorVersion = 15 // Setup in-memory fs fsys := afero.NewMemMapFs() diff --git a/internal/db/start/start.go b/internal/db/start/start.go index 78fc1cf45d..f9ba14eb3d 100644 --- a/internal/db/start/start.go +++ b/internal/db/start/start.go @@ -122,7 +122,6 @@ func NewHostConfig() container.HostConfig { RestartPolicy: container.RestartPolicy{Name: "always"}, Binds: []string{ utils.DbId + ":/var/lib/postgresql/data", - utils.ConfigId + ":/etc/postgresql-custom", }, } if utils.Config.Db.MajorVersion <= 14 { diff --git a/internal/db/start/start_test.go b/internal/db/start/start_test.go index 4cad4fb118..39f23d8bad 100644 --- a/internal/db/start/start_test.go +++ b/internal/db/start/start_test.go @@ -55,7 +55,6 @@ func TestStartDatabase(t *testing.T) { t.Run("initialize main branch", func(t *testing.T) { utils.Config.Db.MajorVersion = 15 utils.DbId = "supabase_db_test" - utils.ConfigId = "supabase_config_test" utils.Config.Db.Port = 5432 // Setup in-memory fs fsys := afero.NewMemMapFs() @@ -103,7 +102,6 @@ func TestStartDatabase(t *testing.T) { t.Run("recover from backup volume", func(t *testing.T) { utils.Config.Db.MajorVersion = 14 utils.DbId = "supabase_db_test" - utils.ConfigId = "supabase_config_test" utils.Config.Db.Port = 5432 // Setup in-memory fs fsys := afero.NewMemMapFs() @@ -316,7 +314,6 @@ func TestStartDatabaseWithCustomSettings(t *testing.T) { // Setup utils.Config.Db.MajorVersion = 15 utils.DbId = "supabase_db_test" - utils.ConfigId = "supabase_config_test" utils.Config.Db.Port = 5432 utils.Config.Db.Settings.MaxConnections = cast.Ptr(uint(50)) diff --git a/internal/start/start_test.go b/internal/start/start_test.go index 787fba4f6b..a90d7a719c 100644 --- a/internal/start/start_test.go +++ b/internal/start/start_test.go @@ -120,7 +120,6 @@ func TestDatabaseStart(t *testing.T) { } // Start postgres utils.DbId = "test-postgres" - utils.ConfigId = "test-config" utils.Config.Db.Port = 54322 utils.Config.Db.MajorVersion = 15 gock.New(utils.Docker.DaemonHost()). @@ -230,7 +229,6 @@ func TestDatabaseStart(t *testing.T) { JSON(image.InspectResponse{}) // Start postgres utils.DbId = "test-postgres" - utils.ConfigId = "test-config" utils.Config.Db.Port = 54322 utils.Config.Db.MajorVersion = 15 gock.New(utils.Docker.DaemonHost()). diff --git a/internal/stop/stop_test.go b/internal/stop/stop_test.go index d260143dfc..e39fdd722b 100644 --- a/internal/stop/stop_test.go +++ b/internal/stop/stop_test.go @@ -191,7 +191,6 @@ func TestStopServices(t *testing.T) { t.Run("removes data volumes", func(t *testing.T) { utils.DbId = "test-db" - utils.ConfigId = "test-config" utils.StorageId = "test-storage" utils.EdgeRuntimeId = "test-functions" utils.InbucketId = "test-inbucket" @@ -208,7 +207,6 @@ func TestStopServices(t *testing.T) { t.Run("skips all filter when removing data volumes with Docker version pre-v1.42", func(t *testing.T) { utils.DbId = "test-db" - utils.ConfigId = "test-config" utils.StorageId = "test-storage" utils.EdgeRuntimeId = "test-functions" utils.InbucketId = "test-inbucket" diff --git a/internal/utils/config.go b/internal/utils/config.go index 62e0134e47..108c3391a1 100644 --- a/internal/utils/config.go +++ b/internal/utils/config.go @@ -18,7 +18,6 @@ import ( var ( NetId string DbId string - ConfigId string KongId string GotrueId string InbucketId string @@ -64,7 +63,6 @@ func UpdateDockerIds() { NetId = GetId("network") } DbId = GetId(DbAliases[0]) - ConfigId = GetId("config") KongId = GetId(KongAliases[0]) GotrueId = GetId(GotrueAliases[0]) InbucketId = GetId(InbucketAliases[0])