From 2058d75e2e6d383f7eda74d2a9a5fb589f868323 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Thu, 21 Jan 2021 23:32:58 -0700 Subject: [PATCH] dev: correct codeinsights-db port; add connection info This is a prerequisite to running codeinsights DB migrations: #17586 Helps #17219 Signed-off-by: Stephen Gutekanst --- dev/codeinsights-db.sh | 4 ++-- dev/start.sh | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dev/codeinsights-db.sh b/dev/codeinsights-db.sh index 1b4ae3fd4cd2..f7c803cc557e 100755 --- a/dev/codeinsights-db.sh +++ b/dev/codeinsights-db.sh @@ -12,7 +12,7 @@ fi IMAGE=sourcegraph/codeinsights-db:dev CONTAINER=codeinsights-db -PORT=3370 +PORT=5435 docker inspect $CONTAINER >/dev/null 2>&1 && docker rm -f $CONTAINER @@ -55,6 +55,6 @@ docker run --rm \ --cpus=1 \ --memory=1g \ -e POSTGRES_PASSWORD=password \ - -p 0.0.0.0:5435:5435 \ + -p 0.0.0.0:${PORT}:5432 \ -v "${DISK}":/var/lib/postgresql/data \ ${IMAGE} >"${LOG_FILE}" 2>&1 || finish diff --git a/dev/start.sh b/dev/start.sh index cbc19e0432a6..92edf1568391 100755 --- a/dev/start.sh +++ b/dev/start.sh @@ -61,6 +61,10 @@ export CODEINTEL_PGSSLMODE="${PGSSLMODE:-}" export CODEINTEL_PGDATASOURCE="${PGDATASOURCE:-}" export CODEINTEL_PG_ALLOW_SINGLE_DB=true +# Code Insights uses a separate database, because it's easier to run TimescaleDB in +# Docker than install as a Postgres extension in dev environments. +export CODEINSIGHTS_PGDATASOURCE=postgres://postgres:password@127.0.0.1:5435 + # Default to "info" level debugging, and "condensed" log format (nice for human readers) export SRC_LOG_LEVEL=${SRC_LOG_LEVEL:-info} export SRC_LOG_FORMAT=${SRC_LOG_FORMAT:-condensed}