Consolidate docker_compose into docker directory

.github/ci-filters.yml

@@ -42,7 +42,7 @@ docker:
   - 'docker/**'
 docker_compose:
   - *shared
-  - 'docker_compose/**'
+  - 'docker/lib/dependabot/docker_compose/**'
 dotnet_sdk:
   - *shared
   - 'dotnet_sdk/**'

.github/labeler.yml

@@ -20,7 +20,7 @@
 
 "L: docker:compose":
 - changed-files:
-  - any-glob-to-any-file: docker_compose/**
+  - any-glob-to-any-file: docker/lib/dependabot/docker_compose/**
 
 "L: dotnet:dotnet-sdk":
 - changed-files:

.github/workflows/ci.yml

@@ -20,12 +20,12 @@ jobs:
           - { path: bun, name: bun, ecosystem: bun }
           - { path: bundler, name: bundler, ecosystem: bundler }
           - { path: cargo, name: cargo, ecosystem: cargo }
-          - { path: common, name: common, ecosystem: common}
+          - { path: common, name: common, ecosystem: common }
           - { path: composer, name: composer, ecosystem: composer }
           - { path: conda, name: conda, ecosystem: conda }
           - { path: devcontainers, name: devcontainers, ecosystem: devcontainers }
-          - { path: docker_compose, name: docker_compose, ecosystem: docker-compose }
           - { path: docker, name: docker, ecosystem: docker }
+          - { path: docker, name: docker_compose, ecosystem: docker-compose, build: docker_compose }
           - { path: dotnet_sdk, name: dotnet_sdk, ecosystem: dotnet-sdk }
           - { path: elm, name: elm, ecosystem: elm }
           - { path: git_submodules, name: git_submodules, ecosystem: gitsubmodule }
@@ -38,13 +38,13 @@ jobs:
           - { path: maven, name: maven, ecosystem: maven }
           - { path: npm_and_yarn, name: npm_and_yarn, ecosystem: npm }
           - { path: nuget, name: nuget, ecosystem: nuget }
+          - { path: opentofu, name: opentofu, ecosystem: opentofu }
           - { path: pub, name: pub, ecosystem: pub }
-          - { path: python, name: python_slow, ecosystem: pip }
           - { path: python, name: python, ecosystem: pip }
+          - { path: python, name: python_slow, ecosystem: pip }
           - { path: rust_toolchain, name: rust_toolchain, ecosystem: rust-toolchain }
           - { path: swift, name: swift, ecosystem: swift }
           - { path: terraform, name: terraform, ecosystem: terraform }
-          - { path: opentofu, name: opentofu, ecosystem: opentofu }
           - { path: uv, name: uv, ecosystem: uv }
           - { path: vcpkg, name: vcpkg, ecosystem: vcpkg }
 
@@ -63,7 +63,7 @@ jobs:
 
       - 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 }}
 
       - name: Run ${{ matrix.suite.name }} tests
         if: steps.changes.outputs[matrix.suite.path] == 'true'

Gemfile

@@ -11,7 +11,7 @@ gem "dependabot-composer", path: "composer"
 gem "dependabot-conda", path: "conda"
 gem "dependabot-devcontainers", path: "devcontainers"
 gem "dependabot-docker", path: "docker"
-gem "dependabot-docker_compose", path: "docker_compose"
+gem "dependabot-docker_compose", path: "docker"
 gem "dependabot-dotnet_sdk", path: "dotnet_sdk"
 gem "dependabot-elm", path: "elm"
 gem "dependabot-github_actions", path: "github_actions"

Gemfile.lock

@@ -68,18 +68,14 @@ PATH
     dependabot-devcontainers (0.355.0)
       dependabot-common (= 0.355.0)
 
-PATH
-  remote: docker_compose
-  specs:
-    dependabot-docker_compose (0.355.0)
-      dependabot-common (= 0.355.0)
-      dependabot-docker (= 0.355.0)
-
 PATH
   remote: docker
   specs:
     dependabot-docker (0.355.0)
       dependabot-common (= 0.355.0)
+    dependabot-docker_compose (0.355.0)
+      dependabot-common (= 0.355.0)
+      dependabot-docker (= 0.355.0)
 
 PATH
   remote: dotnet_sdk

bin/docker-dev-shell

@@ -181,11 +181,10 @@ docker run --rm -ti \
   -v "$(pwd)/docker/lib:$CODE_DIR/docker/lib" \
   -v "$(pwd)/docker/script:$CODE_DIR/docker/script" \
   -v "$(pwd)/docker/spec:$CODE_DIR/docker/spec" \
-  -v "$(pwd)/docker_compose/.rubocop.yml:$CODE_DIR/docker_compose/.rubocop.yml" \
-  -v "$(pwd)/docker_compose/dependabot-docker_compose.gemspec:$CODE_DIR/docker_compose/dependabot-docker_compose.gemspec" \
-  -v "$(pwd)/docker_compose/lib:$CODE_DIR/docker_compose/lib" \
-  -v "$(pwd)/docker_compose/script:$CODE_DIR/docker_compose/script" \
-  -v "$(pwd)/docker_compose/spec:$CODE_DIR/docker_compose/spec" \
+  -v "$(pwd)/docker/.rubocop.yml:$CODE_DIR/docker_compose/.rubocop.yml" \
+  -v "$(pwd)/docker/dependabot-docker_compose.gemspec:$CODE_DIR/docker_compose/dependabot-docker_compose.gemspec" \
+  -v "$(pwd)/docker/script:$CODE_DIR/docker_compose/script" \
+  -v "$(pwd)/docker/spec:$CODE_DIR/docker_compose/spec" \
   -v "$(pwd)/dotnet_sdk/.rubocop.yml:$CODE_DIR/dotnet_sdk/.rubocop.yml" \
   -v "$(pwd)/dotnet_sdk/dependabot-dotnet_sdk.gemspec:$CODE_DIR/dotnet_sdk/dependabot-dotnet_sdk.gemspec" \
   -v "$(pwd)/dotnet_sdk/lib:$CODE_DIR/dotnet_sdk/lib" \

bin/dry-run.rb

@@ -66,7 +66,6 @@
 $LOAD_PATH << "./composer/lib"
 $LOAD_PATH << "./conda/lib"
 $LOAD_PATH << "./devcontainers/lib"
-$LOAD_PATH << "./docker_compose/lib"
 $LOAD_PATH << "./docker/lib"
 $LOAD_PATH << "./dotnet_sdk/lib"
 $LOAD_PATH << "./elm/lib"
@@ -123,7 +122,6 @@
 require "dependabot/conda"
 require "dependabot/devcontainers"
 require "dependabot/docker"
-require "dependabot/docker_compose"
 require "dependabot/dotnet_sdk"
 require "dependabot/elm"
 require "dependabot/git_submodules"

bin/test

@@ -71,13 +71,13 @@ fi
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
 
-if [[ ! -d "$REPO_ROOT/$ECOSYSTEM" ]]; then
-  echo "error: ecosystem directory '$ECOSYSTEM' not found" >&2
+if [[ ! -d "$REPO_ROOT/$HOST_ECOSYSTEM_DIR" ]]; then
+  echo "error: ecosystem directory '$HOST_ECOSYSTEM_DIR' not found" >&2
   exit 1
 fi
 
-if [[ ! -d "$REPO_ROOT/$WORKDIR" ]]; then
-  echo "error: workdir '$WORKDIR' not found" >&2
+if [[ ! -d "$REPO_ROOT/$HOST_WORKDIR" ]]; then
+  echo "error: workdir '$HOST_WORKDIR' not found" >&2
   exit 1
 fi
 

docker/README.md

@@ -2,6 +2,8 @@
 
 Docker support for [`dependabot-core`][core-repo].
 
+**Note:** The `docker_compose` ecosystem is also located in this directory at `docker/docker_compose/` to share common code while maintaining separate package management.
+
 ### Running locally
 
 1. Start a development shell

docker_compose/dependabot-docker_compose.gemspec → docker/dependabot-docker_compose.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.required_rubygems_version = common_gemspec.required_ruby_version
 
   spec.require_path = "lib"
-  spec.files        = Dir["lib/**/*"]
+  spec.files        = Dir["lib/dependabot/docker_compose.rb", "lib/dependabot/docker_compose/**/*"]
 
   spec.add_dependency "dependabot-common", Dependabot::VERSION
   spec.add_dependency "dependabot-docker", Dependabot::VERSION