Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: use dockerhub's image by default #13067

Merged
merged 8 commits into from
Oct 31, 2023
Merged
Show file tree
Hide file tree
Changes from 7 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
8 changes: 3 additions & 5 deletions ci/scripts/integration-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,11 @@ cd integration_tests/scripts

echo "--- case: ${case}, format: ${format}"

if [ -z "${RW_IMAGE_VERSION-}" ]; then
export RW_IMAGE_VERSION=latest
fi
if [ "${BUILDKITE_SOURCE}" == "schedule" ]; then
export RW_IMAGE_VERSION="nightly-$(date '+%Y%m%d')"
# Use ghcr nightly image for scheduled build. If not specified, we use dockerhub's 'risingwavelabs/risingwave'.
export RW_IMAGE="ghcr.io/risingwavelabs/risingwave:nightly-$(date '+%Y%m%d')"
echo Docker image: $RW_IMAGE
fi
echo Docker image version: $RW_IMAGE_VERSION

echo "--- rewrite docker compose for protobuf"
if [ "${format}" == "protobuf" ]; then
Expand Down
17 changes: 6 additions & 11 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
---
version: "3"
x-image: &image
image: ${RW_IMAGE:-risingwavelabs/risingwave:v1.3.0}
services:
compactor-0:
image: "ghcr.io/risingwavelabs/risingwave:${RW_IMAGE_VERSION:-v1.3.0}"
<<: *image
command:
- compactor-node
- "--listen-addr"
Expand Down Expand Up @@ -37,7 +39,7 @@ services:
timeout: 5s
retries: 5
compute-node-0:
image: "ghcr.io/risingwavelabs/risingwave:${RW_IMAGE_VERSION:-v1.3.0}"
<<: *image
command:
- compute-node
- "--listen-addr"
Expand Down Expand Up @@ -122,7 +124,7 @@ services:
timeout: 5s
retries: 5
frontend-node-0:
image: "ghcr.io/risingwavelabs/risingwave:${RW_IMAGE_VERSION:-v1.3.0}"
<<: *image
command:
- frontend-node
- "--listen-addr"
Expand Down Expand Up @@ -179,7 +181,7 @@ services:
timeout: 5s
retries: 5
meta-node-0:
image: "ghcr.io/risingwavelabs/risingwave:${RW_IMAGE_VERSION:-v1.3.0}"
<<: *image
command:
- meta-node
- "--listen-addr"
Expand Down Expand Up @@ -295,13 +297,6 @@ services:
interval: 1s
timeout: 5s
retries: 5
connector-node:
image: ghcr.io/risingwavelabs/risingwave:${RW_IMAGE_VERSION:-v1.3.0}
entrypoint: "/risingwave/bin/connector-node/start-service.sh"
ports:
- 50051
- 50052
container_name: connector-node
message_queue:
image: "docker.vectorized.io/vectorized/redpanda:latest"
command:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@ services:
extends:
file: ../../docker/docker-compose.yml
service: meta-node-0
connector-node:
extends:
file: ../../docker/docker-compose.yml
service: connector-node
minio-0:
extends:
file: ../../docker/docker-compose.yml
Expand Down
4 changes: 0 additions & 4 deletions integration_tests/citus-cdc/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@ services:
extends:
file: ../../docker/docker-compose.yml
service: prometheus-0
connector-node:
extends:
file: ../../docker/docker-compose.yml
service: connector-node
citus-master:
container_name: citus-master
image: "citusdata/citus:10.2.5"
Expand Down
4 changes: 0 additions & 4 deletions integration_tests/elasticsearch-sink/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@ services:
extends:
file: ../../docker/docker-compose.yml
service: meta-node-0
connector-node:
extends:
file: ../../docker/docker-compose.yml
service: connector-node
minio-0:
extends:
file: ../../docker/docker-compose.yml
Expand Down
4 changes: 0 additions & 4 deletions integration_tests/feature-store/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,6 @@ services:
extends:
file: ../../docker/docker-compose.yml
service: prometheus-0
connector-node:
extends:
file: ../../docker/docker-compose.yml
service: connector-node
volumes:
etcd-0:
external: false
Expand Down
4 changes: 0 additions & 4 deletions integration_tests/iceberg-sink/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,6 @@ services:
timeout: 5s
retries: 5
container_name: mysql
connector-node:
extends:
file: ../../docker/docker-compose.yml
service: connector-node
prepare_mysql:
image: mysql:8.0
depends_on:
Expand Down
4 changes: 0 additions & 4 deletions integration_tests/mysql-cdc/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,6 @@ services:
timeout: 5s
retries: 5
container_name: mysql
connector-node:
extends:
file: ../../docker/docker-compose.yml
service: connector-node
datagen_tpch:
image: ghcr.io/risingwavelabs/go-tpc:v0.1
depends_on:
Expand Down
4 changes: 0 additions & 4 deletions integration_tests/mysql-sink/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,6 @@ services:
timeout: 5s
retries: 5
container_name: mysql
connector-node:
extends:
file: ../../docker/docker-compose.yml
service: connector-node
datagen:
build: ../datagen
depends_on: [message_queue]
Expand Down
4 changes: 0 additions & 4 deletions integration_tests/postgres-cdc/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,6 @@ services:
command: [ "postgres", "-c", "wal_level=logical" ]
restart: always
container_name: postgres
connector-node:
extends:
file: ../../docker/docker-compose.yml
service: connector-node
postgres_prepare:
image: postgres
depends_on:
Expand Down
4 changes: 0 additions & 4 deletions integration_tests/postgres-sink/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,6 @@ services:
command: [ "postgres", "-c", "wal_level=logical" ]
restart: always
container_name: postgres
connector-node:
extends:
file: ../../docker/docker-compose.yml
service: connector-node
prepare_postgres:
image: postgres
depends_on:
Expand Down
4 changes: 0 additions & 4 deletions integration_tests/tidb-cdc-sink/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@ services:
extends:
file: ../../docker/docker-compose.yml
service: prometheus-0
connector-node:
extends:
file: ../../docker/docker-compose.yml
service: connector-node

#=================== TiDB & TiCDC components ==================
ticdc-controller:
Expand Down
Loading