From 514a5fc3a95a692294b6481a9e78b7d22ce1065b Mon Sep 17 00:00:00 2001 From: darkskygit Date: Wed, 12 Mar 2025 11:59:46 +0000 Subject: [PATCH] feat(server): update deploy config for context (#10431) --- .devcontainer/docker-compose.yml | 2 +- .docker/dev/.env.example | 3 +++ .docker/dev/compose.yml.example | 2 +- .github/workflows/build-test.yml | 8 ++++---- .github/workflows/copilot-test.yml | 4 ++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 3c0ec967d..ad9ffe1e6 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -14,7 +14,7 @@ services: REDIS_SERVER_HOST: redis db: - image: postgres:latest + image: pgvector/pgvector:pg16 restart: unless-stopped volumes: - postgres-data:/var/lib/postgresql/data diff --git a/.docker/dev/.env.example b/.docker/dev/.env.example index c8c53b42f..0ba7abf87 100644 --- a/.docker/dev/.env.example +++ b/.docker/dev/.env.example @@ -1,3 +1,6 @@ +# postgres major version +DB_VERSION=16 +# database credentials DB_PASSWORD=affine DB_USERNAME=affine DB_DATABASE_NAME=affine \ No newline at end of file diff --git a/.docker/dev/compose.yml.example b/.docker/dev/compose.yml.example index 4ef3016bd..73559f52c 100644 --- a/.docker/dev/compose.yml.example +++ b/.docker/dev/compose.yml.example @@ -3,7 +3,7 @@ services: postgres: env_file: - .env - image: postgres:16 + image: postgres:${DB_VERSION:-16} ports: - 5432:5432 environment: diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index f5a3ebfb7..5c28d3bf6 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -432,7 +432,7 @@ jobs: REDIS_SERVER_HOST: localhost services: postgres: - image: postgres + image: pgvector/pgvector:pg16 env: POSTGRES_PASSWORD: affine options: >- @@ -521,7 +521,7 @@ jobs: REDIS_SERVER_HOST: localhost services: postgres: - image: postgres + image: pgvector/pgvector:pg16 env: POSTGRES_PASSWORD: affine options: >- @@ -617,7 +617,7 @@ jobs: - build-server-native services: postgres: - image: postgres + image: pgvector/pgvector:pg16 env: POSTGRES_PASSWORD: affine options: >- @@ -714,7 +714,7 @@ jobs: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn affine @affine-test/affine-desktop-cloud e2e services: postgres: - image: postgres + image: pgvector/pgvector:pg16 env: POSTGRES_PASSWORD: affine options: >- diff --git a/.github/workflows/copilot-test.yml b/.github/workflows/copilot-test.yml index d863ce088..00ee8ddbb 100644 --- a/.github/workflows/copilot-test.yml +++ b/.github/workflows/copilot-test.yml @@ -40,7 +40,7 @@ jobs: REDIS_SERVER_HOST: localhost services: postgres: - image: postgres + image: pgvector/pgvector:pg16 env: POSTGRES_PASSWORD: affine options: >- @@ -112,7 +112,7 @@ jobs: - build-server-native services: postgres: - image: postgres + image: pgvector/pgvector:pg16 env: POSTGRES_PASSWORD: affine options: >-