Skip to content

Commit d497ecf

Browse files
authored
Merge branch 'main' into chore/smoke-test-clickhouse-26.8
2 parents 8e84c87 + f2b8986 commit d497ecf

6 files changed

Lines changed: 14 additions & 5 deletions

File tree

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
'@hyperdx/api': patch
3+
---
4+
5+
fix: pin bundled ClickHouse to 26.8.36.3 for a security fix
6+
7+
The all-in-one image and the Docker Compose files now use
8+
`clickhouse/clickhouse-server:26.8.36.3-alpine` instead of the floating
9+
`26.8-alpine` tag.

‎docker-compose.ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ services:
2222
depends_on:
2323
- ch-server
2424
ch-server:
25-
image: clickhouse/clickhouse-server:26.8-alpine
25+
image: clickhouse/clickhouse-server:26.8.36.3-alpine
2626
environment:
2727
# default settings
2828
CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: 1

‎docker-compose.dev.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ services:
112112
hdx.dev.service: clickhouse
113113
hdx.dev.port: '${HDX_DEV_CH_HTTP_PORT:-8123}'
114114
hdx.dev.url: 'http://localhost:${HDX_DEV_CH_HTTP_PORT:-8123}'
115-
image: clickhouse/clickhouse-server:26.8-alpine
115+
image: clickhouse/clickhouse-server:26.8.36.3-alpine
116116
ports:
117117
- '${HDX_DEV_CH_HTTP_PORT:-8123}:8123' # http api
118118
- '${HDX_DEV_CH_NATIVE_PORT:-9000}:9000' # native

‎docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ services:
109109
- ch-server
110110
- db
111111
ch-server:
112-
image: clickhouse/clickhouse-server:26.8-alpine
112+
image: clickhouse/clickhouse-server:26.8.36.3-alpine
113113
# WARNING: Exposing the database port will make it accessible from outside the container,
114114
# potentially allowing unauthorized access. If you uncomment the ports below,
115115
# ensure to secure your database (e.g., with strong authentication, proper network rules, and firewalls).

‎docker/hyperdx/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# - Otel Collector (otelcol)
99

1010
ARG NODE_VERSION=22.23.4
11-
ARG CLICKHOUSE_VERSION=26.8
11+
ARG CLICKHOUSE_VERSION=26.8.36.3
1212
ARG OTEL_COLLECTOR_VERSION=0.155.0
1313
ARG OTEL_COLLECTOR_CORE_VERSION=1.61.0
1414

‎packages/app/tests/e2e/docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ services:
1515
memory: 512M
1616
cpus: '0.5'
1717
ch-server:
18-
image: clickhouse/clickhouse-server:26.8-alpine
18+
image: clickhouse/clickhouse-server:26.8.36.3-alpine
1919
ports:
2020
- ${HDX_E2E_CH_PORT:-20500}:8123 # http api
2121
- ${HDX_E2E_CH_NATIVE_PORT:-20600}:9000 # native

0 commit comments

Comments
 (0)