diff --git a/cmd/envtool/envtool.go b/cmd/envtool/envtool.go index 72ca0627..245f71ad 100644 --- a/cmd/envtool/envtool.go +++ b/cmd/envtool/envtool.go @@ -261,7 +261,7 @@ func main() { switch cmd { case "setup": - ctx, cancel := context.WithTimeout(context.Background(), time.Minute) + ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute) defer cancel() err = setup(ctx, logger) diff --git a/cmd/envtool/setup.go b/cmd/envtool/setup.go index 1a30494d..804d582d 100644 --- a/cmd/envtool/setup.go +++ b/cmd/envtool/setup.go @@ -21,7 +21,6 @@ import ( "log/slog" "net" "net/url" - "runtime" "time" "github.com/FerretDB/wire/wirebson" @@ -173,12 +172,9 @@ func setup(ctx context.Context, logger *slog.Logger) error { return lazyerrors.Error(err) } - // TODO https://github.com/FerretDB/FerretDB/issues/5369 - if runtime.GOARCH != "arm64" { - uri = "postgres://pg-user:pg-pass@127.0.0.1:5433/yugabyte" - if err = setupUser(ctx, uri, logging.WithName(logger, "yugabytedb")); err != nil { - return lazyerrors.Error(err) - } + uri = "postgres://pg-user:pg-pass@127.0.0.1:5433/yugabyte" + if err = setupUser(ctx, uri, logging.WithName(logger, "yugabytedb")); err != nil { + return lazyerrors.Error(err) } logger.InfoContext(ctx, "Done") diff --git a/docker-compose.yml b/docker-compose.yml index f0cba414..3e5c1341 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,6 +31,7 @@ services: context: ./build/deps dockerfile: yugabytedb.Dockerfile container_name: ferretdb_yugabytedb + platform: linux/amd64 # TODO https://github.com/FerretDB/FerretDB/issues/5369 # postgresql.conf is populated by "ysql_pg_conf_csv" flag # https://docs.yugabyte.com/preview/reference/configuration/yugabyted/#pass-additional-flags-to-yb-master-and-yb-tserver command: >