Merge branch 'main' into iain/dockerfile-node18-node22

specklesystems · Feb 18, 2025 · 3c63232 · 3c63232
2 parents aaaf75d + 49438f0
commit 3c63232
Show file tree

Hide file tree

Showing 327 changed files with 6,834 additions and 6,019 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -495,7 +495,7 @@ jobs:
       REDIS_URL: 'redis://127.0.0.1:6379'
       S3_REGION: '' # optional, defaults to 'us-east-1'
       ENCRYPTION_KEYS_PATH: 'test/assets/automate/encryptionKeys.json'
-      FF_BILLING_INTEGRATION_ENABLED: 'true'
+      ENABLE_ALL_FFS: 'true'
       RATELIMITER_ENABLED: 'false'
     steps:
       - checkout
@@ -598,16 +598,24 @@ jobs:
           POSTGRES_PASSWORD: speckle
           POSTGRES_USER: speckle
         command: -c 'max_connections=1000' -c 'port=5433' -c 'wal_level=logical'
+      - image: 'speckle/speckle-postgres'
+        environment:
+          POSTGRES_DB: speckle2_test
+          POSTGRES_PASSWORD: speckle
+          POSTGRES_USER: speckle
+        command: -c 'max_connections=1000' -c 'port=5434' -c 'wal_level=logical'
       - image: 'minio/minio'
         command: server /data --console-address ":9001" --address "0.0.0.0:9000"
       - image: 'minio/minio'
         command: server /data --console-address ":9021" --address "0.0.0.0:9020"
+      - image: 'minio/minio'
+        command: server /data --console-address ":9041" --address "0.0.0.0:9040"
     environment:
       # Same as test-server:
       NODE_ENV: test
       DATABASE_URL: 'postgres://speckle:[email protected]:5432/speckle2_test'
       PGDATABASE: speckle2_test
-      POSTGRES_MAX_CONNECTIONS_SERVER: 20
+      POSTGRES_MAX_CONNECTIONS_SERVER: 50
       PGUSER: speckle
       SESSION_SECRET: 'keyboard cat'
       STRATEGY_LOCAL: 'true'

diff --git a/.circleci/multiregion.test-ci.json b/.circleci/multiregion.test-ci.json
@@ -25,6 +25,19 @@
         "endpoint": "http://127.0.0.1:9020",
         "s3Region": "us-east-1"
       }
+    },
+    "region2": {
+      "postgres": {
+        "connectionUri": "postgresql://speckle:[email protected]:5434/speckle2_test"
+      },
+      "blobStorage": {
+        "accessKey": "minioadmin",
+        "secretKey": "minioadmin",
+        "bucket": "speckle-server",
+        "createBucketIfNotExists": true,
+        "endpoint": "http://127.0.0.1:9040",
+        "s3Region": "us-east-1"
+      }
     }
   }
 }
diff --git a/docker-compose-deps.yml b/docker-compose-deps.yml
@@ -34,6 +34,22 @@ services:
     ports:
       - '127.0.0.1:5401:5432'
 
+  postgres-region2:
+    build:
+      context: .
+      dockerfile: utils/postgres/Dockerfile
+    restart: always
+    environment:
+      POSTGRES_DB: speckle
+      POSTGRES_USER: speckle
+      POSTGRES_PASSWORD: speckle
+    volumes:
+      - postgres-region2-data:/var/lib/postgresql/data/
+      - ./setup/db/10-docker_postgres_init.sql:/docker-entrypoint-initdb.d/10-docker_postgres_init.sql
+      - ./setup/db/11-docker_postgres_keycloack_init.sql:/docker-entrypoint-initdb.d/11-docker_postgres_keycloack_init.sql
+    ports:
+      - '127.0.0.1:5402:5432'
+
   redis:
     image: 'redis:7-alpine'
     restart: always
@@ -62,6 +78,16 @@ services:
       - '127.0.0.1:9020:9000'
       - '127.0.0.1:9021:9001'
 
+  minio-region2:
+    image: 'minio/minio'
+    command: server /data --console-address ":9001"
+    restart: always
+    volumes:
+      - minio-region2-data:/data
+    ports:
+      - '127.0.0.1:9040:9000'
+      - '127.0.0.1:9041:9001'
+
   # Local OIDC provider for testing
   keycloak:
     image: quay.io/keycloak/keycloak:25.0
@@ -133,8 +159,10 @@ services:
 volumes:
   postgres-data:
   postgres-region1-data:
+  postgres-region2-data:
   redis-data:
   pgadmin-data:
   redis_insight-data:
   minio-data:
   minio-region1-data:
+  minio-region2-data: