Consolidate docker_compose into docker directory #13834

Copilot · 2025-12-19T14:26:26Z

What are you trying to accomplish?

Moved docker_compose ecosystem into docker/ directory to eliminate duplicate Dockerfiles and shared code while maintaining both as independent ecosystems. The lib files are now co-located with docker lib files under docker/lib/dependabot/.

Benefits:

Shared code in docker/lib/dependabot/shared/ now clearly co-located with both ecosystems
Docker and docker_compose lib files at the same level under docker/lib/dependabot/
Duplicate Dockerfile logic eliminated (both used nearly identical regctl installation)
Related ecosystems grouped together, clarifying docker_compose's dependency on docker
Physical structure matches logical dependency

Structure:

docker/
├── lib/dependabot/
│   ├── docker/              # Docker lib files
│   ├── docker_compose/      # Docker Compose lib files
│   ├── shared/              # Shared utilities
│   ├── docker.rb
│   └── docker_compose.rb
├── Dockerfile               # Docker ecosystem
└── docker_compose/
    ├── spec/
    ├── Dockerfile           # Docker Compose ecosystem
    ├── gemspec
    └── script/

Key changes:

Lib organization: Moved docker_compose lib files from docker/docker_compose/lib/ to docker/lib/dependabot/docker_compose/ to co-locate with docker lib files
Build system: Added get_dockerfile_path() in script/_common to locate docker_compose's Dockerfile; updated volume mounts in bin/docker-dev-shell (removed separate lib mount) and directory validation in bin/test
Dependencies: Updated gem paths in root and updater Gemfile/Gemfile.lock; adjusted gemspec to reference ../lib for require_path and files; updated rubocop config paths
CI/CD: Updated workflow paths, filter patterns, and labeler rules
Config: Updated rakelib gemspec list, sorbet spec ignore patterns, and bin/dry-run.rb LOAD_PATH

No breaking changes:

Both remain independent gems with separate CI jobs
Container paths unchanged: still /home/dependabot/docker_compose/
User commands unchanged: bin/docker-dev-shell docker_compose, bin/test docker_compose

Anything you want to highlight for special attention from reviewers?

The docker_compose lib files are now co-located with docker lib files at docker/lib/dependabot/docker_compose/ rather than being in a separate docker/docker_compose/lib/ directory. The gemspec, spec, Dockerfile, and other config files remain in docker/docker_compose/. This simplifies the build system as docker_compose lib files are now included in the docker/lib mount automatically.

How will you know you've accomplished your goal?

✅ Both ecosystems load correctly with all classes accessible
✅ Shared classes (SharedFileFetcher, SharedFileParser, SharedFileUpdater) accessible from both ecosystems
✅ Docker and docker_compose lib files co-located at docker/lib/dependabot/
✅ All modules and classes load correctly after restructuring
CI will validate both ecosystems build and test successfully with new structure

Checklist

I have run the complete test suite to ensure all tests and linters pass.
I have thoroughly tested my code changes to ensure they work as expected, including adding additional tests for new functionality.
I have written clear and descriptive commit messages.
I have provided a detailed description of the changes in the pull request, including the problem it addresses, how it fixes the problem, and any relevant details about the implementation.
I have ensured that the code is well-documented and easy to understand.

Original prompt

Can we move docker_compose into the docker directory but maintain them as two sperate ecosytems. The goal is to remove the need for duplicated code and dockerfiles making docker and docker_compose more maintainable

✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.

Co-authored-by: robaiken <[email protected]>

…tion Co-authored-by: robaiken <[email protected]>

Co-authored-by: robaiken <[email protected]>

robaiken · 2025-12-30T13:03:52Z

@copilot move docker_compose into lib/dependabot

Co-authored-by: robaiken <[email protected]>

Copilot · 2025-12-30T13:11:31Z

@copilot move docker_compose into lib/dependabot

Done! Moved docker_compose lib files into docker/lib/dependabot/docker_compose/ in commit 272b2a2.

The lib files are now co-located with docker lib files at the same level:

docker/lib/dependabot/
├── docker/
├── docker_compose/  ← moved here
├── shared/
├── docker.rb
└── docker_compose.rb

The gemspec, spec, and Dockerfile remain in docker/docker_compose/.

Co-authored-by: Mark Allen <[email protected]>

The build script expects directory names (e.g., go_modules, python) but was incorrectly receiving suite names (e.g., go_module, python_slow). This caused failures for go_modules and python_slow tests because: - go_modules: was building 'go_module' instead of 'go_modules' - python_slow: was building 'python_slow' instead of 'python' The fix uses matrix.suite.path as the fallback instead of matrix.suite.name, while still allowing explicit build: overrides for special cases like docker_compose.

kbukum1 · 2026-01-07T15:48:24Z

.github/workflows/ci.yml

      - name: Build ecosystem image
        if: steps.changes.outputs[matrix.suite.path] == 'true'
-        run: script/build ${{ matrix.suite.path }}
+        run: script/build ${{ matrix.suite.build || matrix.suite.path }}


@robaiken , are this similar things? Is there a reason now we are before trying to capture the build path?

To avoid breaking the other filters, adding a new parameter was the simplest approach. While not ideal, refactoring the entire CI matrix would be beyond the scope of this work, especially given that this PR is already quite large.

kbukum1 · 2026-01-07T15:51:36Z

.github/ci-filters.yml

 docker_compose:
  - *shared
-  - 'docker_compose/**'
+  - 'docker/lib/dependabot/docker_compose/**'


@robaiken , I think we can add filter like following

docker/lib/dependabot/docker_compose/**

docker/lib/dependabot/share/**

.github/labeler.yml

kbukum1

I only left a few comments. It is ready after you confirm comments and let me know if you finalized.

Added additional file patterns for Docker labeler.

kbukum1

LGTM

kbukum1

LGTM

thavaahariharangit

LGTM

…e-directory

Initial plan

c9de1c7

Copilot AI assigned Copilot and robaiken Dec 19, 2025

Copilot started work on behalf of robaiken December 19, 2025 14:26 View session

Copilot AI and others added 4 commits December 19, 2025 14:39

Move docker_compose into docker directory and update references

9ae07a7

Co-authored-by: robaiken <[email protected]>

Update Gemfile.lock files and documentation for docker_compose reloca…

3337dc9

…tion Co-authored-by: robaiken <[email protected]>

Update GitHub configs and bin/dry-run.rb for docker_compose relocation

2aba739

Co-authored-by: robaiken <[email protected]>

Update rakelib and sorbet config for docker_compose relocation

09d33e1

Co-authored-by: robaiken <[email protected]>

Copilot AI changed the title ~~[WIP] Move docker compose into docker directory for better maintenance~~ Consolidate docker_compose into docker directory Dec 19, 2025

Copilot AI requested a review from robaiken December 19, 2025 14:55

Copilot finished work on behalf of robaiken December 19, 2025 14:55

github-actions bot added L: docker Docker containers L: docker:compose Docker Compose labels Dec 29, 2025

Copilot started work on behalf of robaiken December 30, 2025 13:04 View session

Move docker_compose lib files into docker/lib/dependabot/

272b2a2

Co-authored-by: robaiken <[email protected]>

Copilot finished work on behalf of robaiken December 30, 2025 13:12

robaiken and others added 11 commits December 31, 2025 13:12

update paths in configuration

a1e376d

Co-authored-by: Mark Allen <[email protected]>

refactoring docker_compose inside of docker

af70608

Merge branch 'main' into copilot/move-docker-compose-directory

72a98c8

use new gem file

b5aa08b

update lock file

8b7b0c7

Merge branch 'main' into copilot/move-docker-compose-directory

2c7c6ef

updating lock files

1126949

use ecosystem name rather than path to build image

2a117f6

simplifying test matric

b4f78d1

rollback simplification of the test matrix

22b51a8

Merge branch 'main' into copilot/move-docker-compose-directory

31b3151

robaiken marked this pull request as ready for review January 6, 2026 14:23

robaiken requested a review from a team as a code owner January 6, 2026 14:23

robaiken added 2 commits January 7, 2026 14:15

Merge branch 'main' into copilot/move-docker-compose-directory

0f9fd85

kbukum1 reviewed Jan 7, 2026

View reviewed changes

.github/labeler.yml Outdated Show resolved Hide resolved

kbukum1 reviewed Jan 7, 2026

View reviewed changes

Update labeler.yml with new Docker file patterns

fdce4d9

Added additional file patterns for Docker labeler.

kbukum1 previously approved these changes Jan 7, 2026

View reviewed changes

fixing lint issues with yaml

03b7dad

robaiken dismissed kbukum1’s stale review via 03b7dad January 7, 2026 18:11

refactoring yaml

ad8ac01

kbukum1 previously approved these changes Jan 7, 2026

View reviewed changes

updating filters

367e5a3

robaiken dismissed kbukum1’s stale review via 367e5a3 January 8, 2026 10:58

Merge branch 'main' into copilot/move-docker-compose-directory

633c35a

thavaahariharangit previously approved these changes Jan 8, 2026

View reviewed changes

robaiken marked this pull request as draft January 8, 2026 16:02

Add require statement for dependabot/docker_compose

0face80

robaiken dismissed thavaahariharangit’s stale review via 0face80 January 8, 2026 16:16

kbukum1 previously approved these changes Jan 8, 2026

View reviewed changes

robaiken added 2 commits January 8, 2026 18:23

Merge remote-tracking branch 'origin' into copilot/move-docker-compos…

381e5dc

…e-directory

updating lockfile

aa36ec5

robaiken dismissed kbukum1’s stale review via aa36ec5 January 8, 2026 18:25

robaiken marked this pull request as ready for review January 8, 2026 19:09

Merge branch 'main' into copilot/move-docker-compose-directory

ca35646

robaiken marked this pull request as draft January 20, 2026 19:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Consolidate docker_compose into docker directory #13834

Consolidate docker_compose into docker directory #13834

Uh oh!

Copilot AI commented Dec 19, 2025 •

edited

Loading

Uh oh!

robaiken commented Dec 30, 2025

Uh oh!

Copilot AI commented Dec 30, 2025

Uh oh!

kbukum1 Jan 7, 2026

Uh oh!

robaiken Jan 7, 2026

Uh oh!

kbukum1 Jan 7, 2026 •

edited

Loading

Uh oh!

Uh oh!

kbukum1 left a comment

Uh oh!

kbukum1 left a comment

Uh oh!

kbukum1 left a comment

Uh oh!

thavaahariharangit left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Consolidate docker_compose into docker directory #13834

Are you sure you want to change the base?

Consolidate docker_compose into docker directory #13834

Uh oh!

Conversation

Copilot AI commented Dec 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What are you trying to accomplish?

Anything you want to highlight for special attention from reviewers?

How will you know you've accomplished your goal?

Checklist

Uh oh!

robaiken commented Dec 30, 2025

Uh oh!

Copilot AI commented Dec 30, 2025

Uh oh!

kbukum1 Jan 7, 2026

Choose a reason for hiding this comment

Uh oh!

robaiken Jan 7, 2026

Choose a reason for hiding this comment

Uh oh!

kbukum1 Jan 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

kbukum1 left a comment

Choose a reason for hiding this comment

Uh oh!

kbukum1 left a comment

Choose a reason for hiding this comment

Uh oh!

kbukum1 left a comment

Choose a reason for hiding this comment

Uh oh!

thavaahariharangit left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Copilot AI commented Dec 19, 2025 •

edited

Loading

kbukum1 Jan 7, 2026 •

edited

Loading