OK: Update the citus version and docker image config.

SalesLoft · Jan 24, 2024 · c84aef3 · c84aef3
1 parent 8da5a40
commit c84aef3
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 20 deletions.
diff --git a/.github/workflows/CI.yml → ...lows/active-record-multi-tenant-tests.yml b/.github/workflows/CI.yml → ...lows/active-record-multi-tenant-tests.yml
@@ -1,4 +1,4 @@
-name: CI
+name: Active Record Multi-Tenant Tests
 
 on:
   push:
@@ -24,17 +24,21 @@ jobs:
           - active_record_6.0
           - active_record_6.1
           - active_record_7.0
+        citus_version:
+          - '10'
+          - '11'
         prepared_statements: [true, false]
         exclude:
           # activesupport-7.0.0 requires ruby version >= 2.7.0
           - ruby: '2.6'
             gemfile: 'rails_7.0'
           - ruby: '2.6'
             gemfile: 'active_record_7.0'
-    name: Ruby ${{ matrix.ruby }} / ${{ matrix.gemfile }} ${{ (matrix.prepared_statements && 'w/ prepared statements') || '' }}
+    name: Ruby ${{ matrix.ruby }} / ${{ matrix.gemfile }} ${{ (matrix.prepared_statements && 'w/ prepared statements') || '' }} / Citus ${{ matrix.citus_version }}
     env:
        BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
        PREPARED_STATEMENTS: ${{ matrix.prepared_statements && '1' }}
+       CITUS_VERSION: ${{ matrix.citus_version }}
     steps:
       - uses: actions/checkout@v2
       - run: |

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,25 +2,31 @@ version: '2.1'
 
 services:
   master:
-    image: 'citusdata/citus:7.5.1'
-    ports: ['5600:5432']
-    labels: ['com.citusdata.role=Master']
-    volumes: ['/var/run/postgresql']
-  manager:
-    container_name: "${COMPOSE_PROJECT_NAME:-citus}_manager"
-    image: 'citusdata/membership-manager:0.1.0'
-    volumes: ['/var/run/docker.sock:/var/run/docker.sock']
-    depends_on: { master: { condition: service_healthy } }
+    container_name: "${COMPOSE_PROJECT_NAME:-citus}_master"
+    image: 'citusdata/citus:${CITUS_VERSION:-11.2}'
+    ports: [ '5600:5432' ]
+    labels: [ 'com.citusdata.role=Master' ]
+    environment:
+      - POSTGRES_HOST_AUTH_METHOD=trust
+    command: -c fsync=off -c full_page_writes=off
   worker1:
-    image: 'citusdata/citus:7.5.1'
-    labels: ['com.citusdata.role=Worker']
+    image: 'citusdata/citus:${CITUS_VERSION:-11.2}'
+    ports: [ '5601:5432' ]
+    labels: [ 'com.citusdata.role=Worker' ]
     depends_on: { manager: { condition: service_healthy } }
+    environment:
+      - POSTGRES_HOST_AUTH_METHOD=trust
+    command: -c fsync=off -c full_page_writes=off
   worker2:
-    image: 'citusdata/citus:7.5.1'
-    labels: ['com.citusdata.role=Worker']
+    image: 'citusdata/citus:${CITUS_VERSION:-11.2}'
+    ports: [ '5602:5432' ]
+    labels: [ 'com.citusdata.role=Worker' ]
     depends_on: { manager: { condition: service_healthy } }
-  healthcheck:
-    image: busybox
-    depends_on:
-      worker1: { condition: service_healthy }
-      worker2: { condition: service_healthy }
+    environment:
+      - POSTGRES_HOST_AUTH_METHOD=trust
+    command: -c fsync=off -c full_page_writes=off
+  manager:
+    container_name: "${COMPOSE_PROJECT_NAME:-citus}_manager"
+    image: 'citusdata/membership-manager:0.2.0'
+    volumes: [ '/var/run/docker.sock:/var/run/docker.sock' ]
+    depends_on: { master: { condition: service_healthy } }