Skip to content

Commit 892bed8

Browse files
ericallamericallam
authored
Upgrade to electricsql 1.2.4 (triggerdotdev#2668)
1 parent a94a11f commit 892bed8

File tree

5 files changed

+48
-18
lines changed

5 files changed

+48
-18
lines changed

‎docker/dev-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ services:
3636

3737
electric:
3838
container_name: electric-dev
39-
image: electricsql/electric:1.0.0-beta.15@sha256:4ae0f895753b82684aa31ea1c708e9e86d0a9bca355acb7270dcb24062520810
39+
image: electricsql/electric:1.2.4@sha256:20da3d0b0e74926c5623392db67fd56698b9e374c4aeb6cb5cadeb8fea171c36
4040
restart: always
4141
environment:
4242
DATABASE_URL: postgresql://postgres:postgres@db:5432/postgres?sslmode=disable

‎docker/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ services:
4949

5050
electric:
5151
container_name: electric
52-
image: electricsql/electric:1.1.14@sha256:784495364583e0675c29f62d3f45ae76ee6e65ea5ad5eec7ae10293f5e439c89
52+
image: electricsql/electric:1.2.4@sha256:20da3d0b0e74926c5623392db67fd56698b9e374c4aeb6cb5cadeb8fea171c36
5353
restart: always
5454
environment:
5555
DATABASE_URL: postgresql://postgres:postgres@database:5432/postgres?sslmode=disable
@@ -64,7 +64,7 @@ services:
6464

6565
electric-shard-1:
6666
container_name: electric-shard-1
67-
image: electricsql/electric:1.1.14@sha256:784495364583e0675c29f62d3f45ae76ee6e65ea5ad5eec7ae10293f5e439c89
67+
image: electricsql/electric:1.2.4@sha256:20da3d0b0e74926c5623392db67fd56698b9e374c4aeb6cb5cadeb8fea171c36
6868
restart: always
6969
environment:
7070
DATABASE_URL: postgresql://postgres:postgres@database:5432/postgres?sslmode=disable

‎hosting/docker/webapp/docker-compose.yml‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,13 @@ services:
2828
# Only needed for bootstrap
2929
command: sh -c "chown -R node:node /home/node/shared && exec ./scripts/entrypoint.sh"
3030
healthcheck:
31-
test: ["CMD", "node", "-e", "http.get('http://localhost:3000/healthcheck', res => process.exit(res.statusCode === 200 ? 0 : 1)).on('error', () => process.exit(1))"]
31+
test:
32+
[
33+
"CMD",
34+
"node",
35+
"-e",
36+
"http.get('http://localhost:3000/healthcheck', res => process.exit(res.statusCode === 200 ? 0 : 1)).on('error', () => process.exit(1))",
37+
]
3238
interval: 30s
3339
timeout: 10s
3440
retries: 5
@@ -120,7 +126,7 @@ services:
120126
start_period: 10s
121127

122128
electric:
123-
image: electricsql/electric:${ELECTRIC_IMAGE_TAG:-1.0.24}
129+
image: electricsql/electric:${ELECTRIC_IMAGE_TAG:-1.2.4}
124130
restart: ${RESTART_POLICY:-unless-stopped}
125131
logging: *logging-config
126132
depends_on:
@@ -154,7 +160,21 @@ services:
154160
networks:
155161
- webapp
156162
healthcheck:
157-
test: ["CMD", "clickhouse-client", "--host", "localhost", "--port", "9000", "--user", "${CLICKHOUSE_USER:-default}", "--password", "${CLICKHOUSE_PASSWORD:-password}", "--query", "SELECT 1"]
163+
test:
164+
[
165+
"CMD",
166+
"clickhouse-client",
167+
"--host",
168+
"localhost",
169+
"--port",
170+
"9000",
171+
"--user",
172+
"${CLICKHOUSE_USER:-default}",
173+
"--password",
174+
"${CLICKHOUSE_PASSWORD:-password}",
175+
"--query",
176+
"SELECT 1",
177+
]
158178
interval: 5s
159179
timeout: 5s
160180
retries: 5

‎hosting/k8s/helm/values.yaml‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@ webapp:
110110
defaultOrgExecutionConcurrencyLimit: 300
111111

112112
# Resources
113-
resources: {}
113+
resources:
114+
{}
114115
# Example resource configuration:
115116
# limits:
116117
# cpu: 1000m
@@ -124,7 +125,8 @@ webapp:
124125
postgres: true # Set to false to disable DATABASE_HOST env var (overrides postgres.external.connectivityCheck)
125126

126127
# Extra environment variables for webapp
127-
extraEnvVars: []
128+
extraEnvVars:
129+
[]
128130
# - name: CUSTOM_VAR
129131
# value: "custom-value"
130132
# - name: SECRET_VAR
@@ -138,7 +140,8 @@ webapp:
138140
# value: "/etc/ssl/certs/postgres-ca.crt"
139141

140142
# Extra volumes for the webapp pod
141-
extraVolumes: []
143+
extraVolumes:
144+
[]
142145
# - name: config-volume
143146
# configMap:
144147
# name: my-config
@@ -155,7 +158,8 @@ webapp:
155158
# path: postgres-ca.crt
156159

157160
# Extra volume mounts for the webapp container
158-
extraVolumeMounts: []
161+
extraVolumeMounts:
162+
[]
159163
# - name: config-volume
160164
# mountPath: /etc/config
161165
# readOnly: true
@@ -244,7 +248,8 @@ webapp:
244248
paths:
245249
- path: /
246250
pathType: Prefix
247-
tls: []
251+
tls:
252+
[]
248253
# - secretName: trigger-tls
249254
# hosts:
250255
# - trigger.local
@@ -317,7 +322,8 @@ supervisor:
317322
role:
318323
name: ""
319324
# Extra environment variables for Supervisor
320-
extraEnvVars: []
325+
extraEnvVars:
326+
[]
321327
# - name: CUSTOM_VAR
322328
# value: "custom-value"
323329

@@ -465,7 +471,7 @@ electric:
465471
image:
466472
registry: docker.io
467473
repository: electricsql/electric
468-
tag: "1.0.24"
474+
tag: "1.2.4"
469475
pullPolicy: IfNotPresent
470476
config:
471477
insecure: true
@@ -514,7 +520,8 @@ electric:
514520
url: "" # For example: "http://electric:3000"
515521

516522
# Extra environment variables for Electric
517-
extraEnvVars: []
523+
extraEnvVars:
524+
[]
518525
# - name: CUSTOM_VAR
519526
# value: "custom-value"
520527

@@ -735,7 +742,8 @@ registry:
735742
successThreshold: 1
736743

737744
# Extra environment variables for Registry
738-
extraEnvVars: []
745+
extraEnvVars:
746+
[]
739747
# - name: CUSTOM_VAR
740748
# value: "custom-value"
741749

@@ -761,7 +769,8 @@ registry:
761769
paths:
762770
- path: /
763771
pathType: Prefix
764-
tls: []
772+
tls:
773+
[]
765774
# - secretName: registry-tls
766775
# hosts:
767776
# - registry.local
@@ -783,7 +792,8 @@ telemetry:
783792

784793
# Extra Kubernetes manifests
785794
# This allows you to add additional Kubernetes resources that will be deployed with the chart
786-
extraManifests: []
795+
extraManifests:
796+
[]
787797
# - apiVersion: v1
788798
# kind: ConfigMap
789799
# metadata:

‎internal-packages/testcontainers/src/utils.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ export async function createElectricContainer(
154154
)}:5432/${postgresContainer.getDatabase()}?sslmode=disable`;
155155

156156
const container = await new GenericContainer(
157-
"electricsql/electric:1.1.14@sha256:784495364583e0675c29f62d3f45ae76ee6e65ea5ad5eec7ae10293f5e439c89"
157+
"electricsql/electric:1.2.4@sha256:20da3d0b0e74926c5623392db67fd56698b9e374c4aeb6cb5cadeb8fea171c36"
158158
)
159159
.withExposedPorts(3000)
160160
.withNetwork(network)

0 commit comments

Comments
 (0)