Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/dev-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
26 changes: 23 additions & 3 deletions hosting/docker/webapp/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
32 changes: 21 additions & 11 deletions hosting/k8s/helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ webapp:
defaultOrgExecutionConcurrencyLimit: 300

# Resources
resources: {}
resources:
{}
# Example resource configuration:
# limits:
# cpu: 1000m
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -244,7 +248,8 @@ webapp:
paths:
- path: /
pathType: Prefix
tls: []
tls:
[]
# - secretName: trigger-tls
# hosts:
# - trigger.local
Expand Down Expand Up @@ -317,7 +322,8 @@ supervisor:
role:
name: ""
# Extra environment variables for Supervisor
extraEnvVars: []
extraEnvVars:
[]
# - name: CUSTOM_VAR
# value: "custom-value"

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -514,7 +520,8 @@ electric:
url: "" # For example: "http://electric:3000"

# Extra environment variables for Electric
extraEnvVars: []
extraEnvVars:
[]
# - name: CUSTOM_VAR
# value: "custom-value"

Expand Down Expand Up @@ -735,7 +742,8 @@ registry:
successThreshold: 1

# Extra environment variables for Registry
extraEnvVars: []
extraEnvVars:
[]
Comment on lines +745 to +746
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

Critical: Invalid YAML syntax for registry extraEnvVars.

Same issue - extraEnvVars: { [] } is invalid YAML syntax.

Apply this diff to fix:

-  extraEnvVars:
-    []
+  extraEnvVars: []
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
extraEnvVars:
[]
extraEnvVars: []
🤖 Prompt for AI Agents
In hosting/k8s/helm/values.yaml around lines 745-746, the registry extraEnvVars
value uses invalid YAML form; replace the current empty-list syntax with an
empty mapping by setting extraEnvVars to {} so the chart expects a map of
environment variables (update the single line to use an empty object rather than
a list).

# - name: CUSTOM_VAR
# value: "custom-value"

Expand All @@ -761,7 +769,8 @@ registry:
paths:
- path: /
pathType: Prefix
tls: []
tls:
[]
# - secretName: registry-tls
# hosts:
# - registry.local
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion internal-packages/testcontainers/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down