diff --git a/docker/dev-compose.yml b/docker/dev-compose.yml index dd39ae7d8a..27f0ba1859 100644 --- a/docker/dev-compose.yml +++ b/docker/dev-compose.yml @@ -36,7 +36,7 @@ services: electric: container_name: electric-dev - image: electricsql/electric:1.0.0-beta.15@sha256:4ae0f895753b82684aa31ea1c708e9e86d0a9bca355acb7270dcb24062520810 + image: electricsql/electric:1.2.4@sha256:20da3d0b0e74926c5623392db67fd56698b9e374c4aeb6cb5cadeb8fea171c36 restart: always environment: DATABASE_URL: postgresql://postgres:postgres@db:5432/postgres?sslmode=disable diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index c94aaa623d..95d1ec3ab6 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -49,7 +49,7 @@ services: electric: container_name: electric - image: electricsql/electric:1.1.14@sha256:784495364583e0675c29f62d3f45ae76ee6e65ea5ad5eec7ae10293f5e439c89 + image: electricsql/electric:1.2.4@sha256:20da3d0b0e74926c5623392db67fd56698b9e374c4aeb6cb5cadeb8fea171c36 restart: always environment: DATABASE_URL: postgresql://postgres:postgres@database:5432/postgres?sslmode=disable @@ -64,7 +64,7 @@ services: electric-shard-1: container_name: electric-shard-1 - image: electricsql/electric:1.1.14@sha256:784495364583e0675c29f62d3f45ae76ee6e65ea5ad5eec7ae10293f5e439c89 + image: electricsql/electric:1.2.4@sha256:20da3d0b0e74926c5623392db67fd56698b9e374c4aeb6cb5cadeb8fea171c36 restart: always environment: DATABASE_URL: postgresql://postgres:postgres@database:5432/postgres?sslmode=disable diff --git a/hosting/docker/webapp/docker-compose.yml b/hosting/docker/webapp/docker-compose.yml index 74331bbc9d..d246babf95 100644 --- a/hosting/docker/webapp/docker-compose.yml +++ b/hosting/docker/webapp/docker-compose.yml @@ -28,7 +28,13 @@ services: # Only needed for bootstrap command: sh -c "chown -R node:node /home/node/shared && exec ./scripts/entrypoint.sh" healthcheck: - test: ["CMD", "node", "-e", "http.get('http://localhost:3000/healthcheck', res => process.exit(res.statusCode === 200 ? 0 : 1)).on('error', () => process.exit(1))"] + test: + [ + "CMD", + "node", + "-e", + "http.get('http://localhost:3000/healthcheck', res => process.exit(res.statusCode === 200 ? 0 : 1)).on('error', () => process.exit(1))", + ] interval: 30s timeout: 10s retries: 5 @@ -120,7 +126,7 @@ services: start_period: 10s electric: - image: electricsql/electric:${ELECTRIC_IMAGE_TAG:-1.0.24} + image: electricsql/electric:${ELECTRIC_IMAGE_TAG:-1.2.4} restart: ${RESTART_POLICY:-unless-stopped} logging: *logging-config depends_on: @@ -154,7 +160,21 @@ services: networks: - webapp healthcheck: - test: ["CMD", "clickhouse-client", "--host", "localhost", "--port", "9000", "--user", "${CLICKHOUSE_USER:-default}", "--password", "${CLICKHOUSE_PASSWORD:-password}", "--query", "SELECT 1"] + test: + [ + "CMD", + "clickhouse-client", + "--host", + "localhost", + "--port", + "9000", + "--user", + "${CLICKHOUSE_USER:-default}", + "--password", + "${CLICKHOUSE_PASSWORD:-password}", + "--query", + "SELECT 1", + ] interval: 5s timeout: 5s retries: 5 diff --git a/hosting/k8s/helm/values.yaml b/hosting/k8s/helm/values.yaml index 4906149372..5576e436b5 100644 --- a/hosting/k8s/helm/values.yaml +++ b/hosting/k8s/helm/values.yaml @@ -110,7 +110,8 @@ webapp: defaultOrgExecutionConcurrencyLimit: 300 # Resources - resources: {} + resources: + {} # Example resource configuration: # limits: # cpu: 1000m @@ -124,7 +125,8 @@ webapp: postgres: true # Set to false to disable DATABASE_HOST env var (overrides postgres.external.connectivityCheck) # Extra environment variables for webapp - extraEnvVars: [] + extraEnvVars: + [] # - name: CUSTOM_VAR # value: "custom-value" # - name: SECRET_VAR @@ -138,7 +140,8 @@ webapp: # value: "/etc/ssl/certs/postgres-ca.crt" # Extra volumes for the webapp pod - extraVolumes: [] + extraVolumes: + [] # - name: config-volume # configMap: # name: my-config @@ -155,7 +158,8 @@ webapp: # path: postgres-ca.crt # Extra volume mounts for the webapp container - extraVolumeMounts: [] + extraVolumeMounts: + [] # - name: config-volume # mountPath: /etc/config # readOnly: true @@ -244,7 +248,8 @@ webapp: paths: - path: / pathType: Prefix - tls: [] + tls: + [] # - secretName: trigger-tls # hosts: # - trigger.local @@ -317,7 +322,8 @@ supervisor: role: name: "" # Extra environment variables for Supervisor - extraEnvVars: [] + extraEnvVars: + [] # - name: CUSTOM_VAR # value: "custom-value" @@ -465,7 +471,7 @@ electric: image: registry: docker.io repository: electricsql/electric - tag: "1.0.24" + tag: "1.2.4" pullPolicy: IfNotPresent config: insecure: true @@ -514,7 +520,8 @@ electric: url: "" # For example: "http://electric:3000" # Extra environment variables for Electric - extraEnvVars: [] + extraEnvVars: + [] # - name: CUSTOM_VAR # value: "custom-value" @@ -735,7 +742,8 @@ registry: successThreshold: 1 # Extra environment variables for Registry - extraEnvVars: [] + extraEnvVars: + [] # - name: CUSTOM_VAR # value: "custom-value" @@ -761,7 +769,8 @@ registry: paths: - path: / pathType: Prefix - tls: [] + tls: + [] # - secretName: registry-tls # hosts: # - registry.local @@ -783,7 +792,8 @@ telemetry: # Extra Kubernetes manifests # This allows you to add additional Kubernetes resources that will be deployed with the chart -extraManifests: [] +extraManifests: + [] # - apiVersion: v1 # kind: ConfigMap # metadata: diff --git a/internal-packages/testcontainers/src/utils.ts b/internal-packages/testcontainers/src/utils.ts index 3ccbcc6bae..11bedef1fd 100644 --- a/internal-packages/testcontainers/src/utils.ts +++ b/internal-packages/testcontainers/src/utils.ts @@ -154,7 +154,7 @@ export async function createElectricContainer( )}:5432/${postgresContainer.getDatabase()}?sslmode=disable`; const container = await new GenericContainer( - "electricsql/electric:1.1.14@sha256:784495364583e0675c29f62d3f45ae76ee6e65ea5ad5eec7ae10293f5e439c89" + "electricsql/electric:1.2.4@sha256:20da3d0b0e74926c5623392db67fd56698b9e374c4aeb6cb5cadeb8fea171c36" ) .withExposedPorts(3000) .withNetwork(network)