Skip to content

Conversation

@suxiaogang223
Copy link
Contributor

@suxiaogang223 suxiaogang223 commented Jan 22, 2026

Summary

This PR includes two improvements to the docker-compose infrastructure:

  1. Clean up unused docker-compose environments (spark and trino)
  2. Fix docker-compose subnet conflicts by assigning unique subnets

Changes

1. Cleanup unused docker-compose (commit: 61631b9)

Removed unused and unmaintained docker-compose environments:

Component Files Removed Lines Deleted
Spark spark/spark.yaml, tools/* (format conversion tools) ~275
Trino trino/*.tpl, trino/scripts/* (all config and scripts) ~576

Total: 12 files deleted, 851 lines removed

Rationale: These docker-compose environments were:

  • No longer actively maintained
  • Superseded by other test setups (iceberg-rest, polaris, etc.)
  • Causing confusion for users

The run-thirdparties-docker.sh script was also updated to remove spark/trino references.

2. Fix subnet conflicts (commit: 54b3fd3)

Added fixed subnets to remaining docker-compose networks:

File Network Subnet
docker/thirdparties/docker-compose/iceberg-rest/docker-compose.yaml.tpl ${CONTAINER_UID}iceberg-rest 172.30.80.0/24
docker/thirdparties/docker-compose/polaris/docker-compose.yaml.tpl ${CONTAINER_UID}polaris 172.31.80.0/24

Rationale: Previously, docker-compose networks relied on Docker's default subnet assignment, which could cause:

  • IP conflicts when running multiple compose environments simultaneously
  • Network overlaps with existing Docker networks on the host
  • Unpredictable network configurations

Impact

  • Smaller, cleaner repository by removing unmaintained docker-compose setups
  • No more subnet conflicts when running multiple docker-compose environments
  • Predictable network configuration for all remaining docker-compose setups

@Thearas
Copy link
Contributor

Thearas commented Jan 22, 2026

Thank you for your contribution to Apache Doris.
Don't know what should be done next? See How to process your PR.

Please clearly describe your PR:

  1. What problem was fixed (it's best to include specific error reporting information). How it was fixed.
  2. Which behaviors were modified. What was the previous behavior, what is it now, why was it modified, and what possible impacts might there be.
  3. What features were added. Why was this function added?
  4. Which code was refactored and why was this part of the code refactored?
  5. Which functions were optimized and what is the difference before and after the optimization?

@suxiaogang223
Copy link
Contributor Author

run buildall

@suxiaogang223
Copy link
Contributor Author

run buildall

1 similar comment
@suxiaogang223
Copy link
Contributor Author

run buildall

@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Jan 24, 2026
@github-actions
Copy link
Contributor

PR approved by at least one committer and no changes requested.

@github-actions
Copy link
Contributor

PR approved by anyone and no changes requested.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by one committer. reviewed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants