From 07f71d110ddecd05a83d059b943feb022717e938 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Tue, 4 Jul 2023 15:53:28 -0700 Subject: [PATCH] deploy: correct blobstore endpoint in sourcegraph/server image (fix 'main' CI) We still use `sourcegraph/server` to run our integration tests in our CI pipelines (yuck) and in my change #54466 I failed to realize that `IsSingleBinary()` and `IsDeployTypeSingleDockerContainer(Type())` report different things. This fixes the issue, and likely fixes `main` on our CI pipelines. Signed-off-by: Stephen Gutekanst --- internal/conf/deploy/endpoints.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/conf/deploy/endpoints.go b/internal/conf/deploy/endpoints.go index 6b5394973c76..2007956971a9 100644 --- a/internal/conf/deploy/endpoints.go +++ b/internal/conf/deploy/endpoints.go @@ -10,7 +10,7 @@ func BlobstoreDefaultEndpoint() string { if IsApp() { return "http://127.0.0.1:49000" } - if IsSingleBinary() { + if IsSingleBinary() || IsDeployTypeSingleDockerContainer(Type()) { return "http://127.0.0.1:9000" } return "http://blobstore:9000" @@ -21,7 +21,7 @@ func BlobstoreHostPort() (string, string) { if IsApp() { return "127.0.0.1", "49000" } - if env.InsecureDev || IsSingleBinary() { + if env.InsecureDev || IsSingleBinary() || IsDeployTypeSingleDockerContainer(Type()) { return "127.0.0.1", "9000" } return "", "9000"