refactor: remove supabase, add postgres, fix tests

.github/workflows/e2e-tests-ci.yml

@@ -12,7 +12,7 @@ jobs:
  node-version: [16.x, 18.x]
  env:
  # Whichever Docker containers are needed to pass e2e tests, define them here
- DOCKER_CONTAINERS: 'sso feed-discovery auth login kong rest meta elasticsearch redis posts traefik'
+ DOCKER_CONTAINERS: 'sso feed-discovery login elasticsearch redis posts traefik'
  # Postgres database connection string to run db migration
  DATABASE_URL: 'postgresql://postgres:your-super-secret-and-long-postgres-password@localhost/postgres'
 

.gitignore

@@ -41,6 +41,9 @@ certs/
 # Redis data storage
 redis-data/
 
+# Postgres
+db
+
 .pnpm-debug.log
 
 # Turborepo

config/env.development

@@ -15,7 +15,7 @@ DOCKER_BUILDKIT=1
 # so it will work on Windows and Unix, see
 # https://docs.docker.com/compose/reference/envvars/#compose_file
 COMPOSE_PATH_SEPARATOR=;
-COMPOSE_FILE=docker/docker-compose.yml;docker/development.yml;docker/supabase/docker-compose.yml;docker/supabase/supabase-development.yml
+COMPOSE_FILE=docker/docker-compose.yml;docker/development.yml
 
 
 # The host where the Telescope 1.0 front-end and back-end are run.
@@ -262,7 +262,7 @@ MAX_POSTS_PER_PAGE=5
 # Supabase Services
 ################################################################################
 
-SUPABASE_URL=http://localhost/v1/supabase
+SUPABASE_URL=postgresql://postgres:your-super-secret-and-long-postgres-password@db/postgres
 
 
 # Auth
@@ -303,4 +303,4 @@ KONG_HTTPS_PORT=8912
 POSTGRES_PORT=8913
 
 ## DB connection string
-DATABASE_URL=postgresql://postgres:your-super-secret-and-long-postgres-password@localhost/postgres
+DATABASE_URL=postgresql://postgres:your-super-secret-and-long-postgres-password@db/postgres

config/env.production

@@ -15,7 +15,7 @@ DOCKER_BUILDKIT=1
 # so it will work on Windows and Unix, see
 # https://docs.docker.com/compose/reference/envvars/#compose_file
 COMPOSE_PATH_SEPARATOR=;
-COMPOSE_FILE=docker/docker-compose.yml;docker/production.yml;docker/supabase/docker-compose.yml;docker/supabase/supabase-production.yml
+COMPOSE_FILE=docker/docker-compose.yml;docker/production.yml
 
 
 # The host where the Telescope 1.0 front-end and back-end are run.

config/env.staging

@@ -15,7 +15,7 @@ DOCKER_BUILDKIT=1
 # so it will work on Windows and Unix, see
 # https://docs.docker.com/compose/reference/envvars/#compose_file
 COMPOSE_PATH_SEPARATOR=;
-COMPOSE_FILE=docker/docker-compose.yml;docker/production.yml;docker/supabase/docker-compose.yml;docker/supabase/supabase-production.yml
+COMPOSE_FILE=docker/docker-compose.yml;docker/production.yml
 
 
 # The host where the Telescope 1.0 front-end and back-end are run.

docker/development.yml

@@ -77,10 +77,6 @@ services:
  context: ../src/api/parser
  cache_from:
  - docker.cdot.systems/parser:buildcache
- environment:
- # In development and testing, the Parser service needs to contact the Supabase
- # service directly via Docker vs through the http://localhost/v1/supabase domain.
- - SUPABASE_URL=http://kong:8000
  depends_on:
  - elasticsearch
  - traefik
@@ -108,10 +104,6 @@ services:
  context: ../src/api/sso
  cache_from:
  - docker.cdot.systems/sso:buildcache
- environment:
- # In development and testing, the SSO service needs to contact the Supabase
- # service directly via Docker vs through the http://localhost/v1/supabase domain.
- - SUPABASE_URL=http://kong:8000
  depends_on:
  - test-web-content
  - traefik
@@ -140,3 +132,9 @@ services:
  context: ../src/api/dependency-discovery
  cache_from:
  - docker.cdot.systems/dependency-discovery:buildcache
+
+ db:
+ ports:
+ - '5432:5432'
+ volumes:
+ - ../db:/var/lib/postgresql/data

docker/docker-compose.yml

@@ -331,3 +331,10 @@ services:
  - 'traefik.http.middlewares.rss_bridge_prefix.stripprefix.prefixes=/${API_VERSION}/rss-bridge'
  # Add our middleware to the router
  - 'traefik.http.routers.rss_bridge.middlewares=rss_bridge_redirect,rss_bridge_prefix'
+
+ db:
+ image: postgres:15-alpine
+ container_name: 'db'
+ restart: unless-stopped
+ environment:
+ POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}

docker/production.yml

@@ -169,3 +169,8 @@ services:
  ]
  depends_on:
  - studio
+
+ db:
+ volumes:
+ # We keep the actual data in a volume outside of git, so it survives restarts
+ - ../../supabase/volumes/db/data:/var/lib/postgresql/data