Skip to content

Commit

Permalink
build(docker): simplify risingwave docker setup (#8126)
Browse files Browse the repository at this point in the history
Remove risingwave-specific minio service in favor of existing minio
service.
  • Loading branch information
cpcloud authored Jan 29, 2024
1 parent 351747a commit f2ff173
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 66 deletions.
75 changes: 13 additions & 62 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,10 @@ services:
retries: 20
test:
- CMD-SHELL
- mc ready data && mc mb --ignore-existing data/trino
- mc ready data && mc mb --ignore-existing data/trino data/risingwave
networks:
- trino
- risingwave
volumes:
- $PWD/docker/minio/config.json:/.mc/config.json:ro

Expand Down Expand Up @@ -537,85 +538,36 @@ services:
networks:
- impala

risingwave-minio:
image: "quay.io/minio/minio:latest"
command:
- server
- "--address"
- "0.0.0.0:9301"
- "--console-address"
- "0.0.0.0:9400"
- /data
expose:
- "9301"
- "9400"
ports:
- "9301:9301"
- "9400:9400"
depends_on: []
volumes:
- "risingwave-minio:/data"
entrypoint: /bin/sh -c "set -e; mkdir -p \"/data/hummock001\"; /usr/bin/docker-entrypoint.sh \"$$0\" \"$$@\" "
environment:
MINIO_CI_CD: "1"
MINIO_ROOT_PASSWORD: hummockadmin
MINIO_ROOT_USER: hummockadmin
MINIO_DOMAIN: "risingwave-minio"
container_name: risingwave-minio
healthcheck:
test:
- CMD-SHELL
- bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/9301; exit $$?;'
interval: 5s
timeout: 5s
retries: 20
restart: always
networks:
- risingwave

risingwave:
image: ghcr.io/risingwavelabs/risingwave:nightly-20240122
command: "standalone --meta-opts=\" \
--advertise-addr 0.0.0.0:5690 \
--backend mem \
--state-store hummock+minio://hummockadmin:hummockadmin@risingwave-minio:9301/hummock001 \
--data-directory hummock_001 \
--config-path /risingwave.toml\" \
--compute-opts=\" \
--config-path /risingwave.toml \
--advertise-addr 0.0.0.0:5688 \
--role both \" \
--frontend-opts=\" \
--config-path /risingwave.toml \
--listen-addr 0.0.0.0:4566 \
--advertise-addr 0.0.0.0:4566 \" \
--compactor-opts=\" \
--advertise-addr 0.0.0.0:6660 \""
expose:
- "4566"
--state-store hummock+minio://accesskey:secretkey@minio:9000/risingwave \
--data-directory hummock_001\" \
--compute-opts=\"--advertise-addr 0.0.0.0:5688 --role both\" \
--frontend-opts=\"--listen-addr 0.0.0.0:4566 --advertise-addr 0.0.0.0:4566\" \
--compactor-opts=\"--advertise-addr 0.0.0.0:6660\""
ports:
- "4566:4566"
- 4566:4566
depends_on:
- risingwave-minio
minio:
condition: service_healthy
volumes:
- "./docker/risingwave/risingwave.toml:/risingwave.toml"
- risingwave:/data
environment:
RUST_BACKTRACE: "1"
# If ENABLE_TELEMETRY is not set, telemetry will start by default
ENABLE_TELEMETRY: ${ENABLE_TELEMETRY:-true}
container_name: risingwave
ENABLE_TELEMETRY: "false"
healthcheck:
test:
- CMD-SHELL
- bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/6660; exit $$?;'
- bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/5688; exit $$?;'
- bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/4566; exit $$?;'
- bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/5690; exit $$?;'
interval: 5s
timeout: 5s
interval: 1s
retries: 20
restart: always
restart: on-failure
networks:
- risingwave

Expand Down Expand Up @@ -646,5 +598,4 @@ volumes:
postgres:
exasol:
impala:
risingwave-minio:
risingwave:
2 changes: 0 additions & 2 deletions docker/risingwave/risingwave.toml

This file was deleted.

3 changes: 1 addition & 2 deletions ibis/backends/tests/test_json.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@
reason="https://github.com/ibis-project/ibis/pull/6920#discussion_r1373212503",
)
@pytest.mark.broken(
["risingwave"],
reason="TODO(Kexiang): order mismatch in array",
["risingwave"], reason="TODO(Kexiang): order mismatch in array", strict=False
)
def test_json_getitem(json_t, expr_fn, expected):
expr = expr_fn(json_t)
Expand Down

0 comments on commit f2ff173

Please sign in to comment.