Skip to content

Commit e34503d

Browse files
committed
Fix docker-compose.yml to allow running without platform environment settings
This allows running e.g. docker-compose up -d after running ./install.sh without needing to source install/check-platform.sh
1 parent 409485c commit e34503d

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

clickhouse/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ARG BASE_IMAGE
2+
FROM ${BASE_IMAGE}

docker-compose.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ x-sentry-defaults: &sentry_defaults
1818
<<: *restart_policy
1919
image: sentry-self-hosted-local
2020
# Set the platform to build for linux/arm64 when needed on Apple silicon Macs.
21-
platform: ${DOCKER_PLATFORM}
21+
platform: ${DOCKER_PLATFORM:-}
2222
build:
2323
context: ./sentry
2424
args:
@@ -192,7 +192,12 @@ services:
192192
test: ["CMD-SHELL", "nc -z localhost 9092"]
193193
clickhouse:
194194
<<: *restart_policy
195-
image: "$CLICKHOUSE_IMAGE"
195+
image: clickhouse-self-hosted-local
196+
build:
197+
context:
198+
./clickhouse
199+
args:
200+
BASE_IMAGE: "${CLICKHOUSE_IMAGE:-}"
196201
ulimits:
197202
nofile:
198203
soft: 262144

0 commit comments

Comments
 (0)