bazel-contrib · malt3 · Oct 6, 2025 · Oct 3, 2025 · Oct 3, 2025 · Oct 5, 2025
diff --git a/.bazelignore b/.bazelignore
@@ -28,3 +28,8 @@ img_tool/bazel-bin
 img_tool/bazel-img_tool
 img_tool/bazel-out
 img_tool/bazel-testlogs
+pull_tool/bazel-bin
+pull_tool/bazel-out
+pull_tool/bazel-pull_tool
+pull_tool/bazel-rules_img_pull_tool
+pull_tool/bazel-testlogs
diff --git a/.bazelrc b/.bazelrc
@@ -1,9 +1,10 @@
 # To update these lines, execute
 # `bazel run @rules_bazel_integration_test//tools:update_deleted_packages`
-build --deleted_packages=e2e/cc,e2e/cc/base,e2e/cc/custom_standard_library,e2e/cc/patches,e2e/cc/platform,e2e/generic,e2e/generic/build_settings,e2e/generic/extend,e2e/generic/load,e2e/generic/multi_deploy,e2e/generic/platform,e2e/go,e2e/go/customization,e2e/go/image,e2e/go/multiarch,e2e/js,e2e/js/app,e2e/js/platform,e2e/python,e2e/python/platform,e2e/python/requirements,e2e/workspace,img_tool,img_tool/cmd,img_tool/cmd/bes,img_tool/cmd/compress,img_tool/cmd/deploy,img_tool/cmd/dockersave,img_tool/cmd/downloadblob,img_tool/cmd/expandtemplate,img_tool/cmd/img,img_tool/cmd/index,img_tool/cmd/layer,img_tool/cmd/layermeta,img_tool/cmd/manifest,img_tool/cmd/ocilayout,img_tool/cmd/pull,img_tool/cmd/push,img_tool/cmd/registry,img_tool/cmd/validate,img_tool/cmd/validate/layer-presence,img_tool/pkg/api,img_tool/pkg/auth/credential,img_tool/pkg/auth/grpcheaderinterceptor,img_tool/pkg/auth/protohelper,img_tool/pkg/auth/registry,img_tool/pkg/cas,img_tool/pkg/compress,img_tool/pkg/compress/util,img_tool/pkg/containerd,img_tool/pkg/contentmanifest,img_tool/pkg/deployvfs,img_tool/pkg/digestfs,img_tool/pkg/docker,img_tool/pkg/fileopener,img_tool/pkg/load,img_tool/pkg/proto/bazel,img_tool/pkg/proto/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream,img_tool/pkg/proto/bazel/src/main/java/com/google/devtools/build/lib/packages/metrics,img_tool/pkg/proto/bazel/src/main/protobuf,img_tool/pkg/proto/blobcache,img_tool/pkg/proto/build_event_service,img_tool/pkg/proto/remote-apis,img_tool/pkg/proto/remote-apis/build/bazel/remote/execution/v2,img_tool/pkg/proto/remote-apis/build/bazel/semver,img_tool/pkg/push,img_tool/pkg/serve/bes,img_tool/pkg/serve/bes/syncer,img_tool/pkg/serve/blobcache,img_tool/pkg/serve/registry,img_tool/pkg/serve/registry/reapi,img_tool/pkg/serve/registry/s3,img_tool/pkg/serve/registry/upstream,img_tool/pkg/tarcas,img_tool/pkg/tree,img_tool/pkg/tree/merkle,img_tool/pkg/tree/runfiles,img_tool/pkg/tree/treeartifact,img_tool/toolchain,img_tool/tools
-query --deleted_packages=e2e/cc,e2e/cc/base,e2e/cc/custom_standard_library,e2e/cc/patches,e2e/cc/platform,e2e/generic,e2e/generic/build_settings,e2e/generic/extend,e2e/generic/load,e2e/generic/multi_deploy,e2e/generic/platform,e2e/go,e2e/go/customization,e2e/go/image,e2e/go/multiarch,e2e/js,e2e/js/app,e2e/js/platform,e2e/python,e2e/python/platform,e2e/python/requirements,e2e/workspace,img_tool,img_tool/cmd,img_tool/cmd/bes,img_tool/cmd/compress,img_tool/cmd/deploy,img_tool/cmd/dockersave,img_tool/cmd/downloadblob,img_tool/cmd/expandtemplate,img_tool/cmd/img,img_tool/cmd/index,img_tool/cmd/layer,img_tool/cmd/layermeta,img_tool/cmd/manifest,img_tool/cmd/ocilayout,img_tool/cmd/pull,img_tool/cmd/push,img_tool/cmd/registry,img_tool/cmd/validate,img_tool/cmd/validate/layer-presence,img_tool/pkg/api,img_tool/pkg/auth/credential,img_tool/pkg/auth/grpcheaderinterceptor,img_tool/pkg/auth/protohelper,img_tool/pkg/auth/registry,img_tool/pkg/cas,img_tool/pkg/compress,img_tool/pkg/compress/util,img_tool/pkg/containerd,img_tool/pkg/contentmanifest,img_tool/pkg/deployvfs,img_tool/pkg/digestfs,img_tool/pkg/docker,img_tool/pkg/fileopener,img_tool/pkg/load,img_tool/pkg/proto/bazel,img_tool/pkg/proto/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream,img_tool/pkg/proto/bazel/src/main/java/com/google/devtools/build/lib/packages/metrics,img_tool/pkg/proto/bazel/src/main/protobuf,img_tool/pkg/proto/blobcache,img_tool/pkg/proto/build_event_service,img_tool/pkg/proto/remote-apis,img_tool/pkg/proto/remote-apis/build/bazel/remote/execution/v2,img_tool/pkg/proto/remote-apis/build/bazel/semver,img_tool/pkg/push,img_tool/pkg/serve/bes,img_tool/pkg/serve/bes/syncer,img_tool/pkg/serve/blobcache,img_tool/pkg/serve/registry,img_tool/pkg/serve/registry/reapi,img_tool/pkg/serve/registry/s3,img_tool/pkg/serve/registry/upstream,img_tool/pkg/tarcas,img_tool/pkg/tree,img_tool/pkg/tree/merkle,img_tool/pkg/tree/runfiles,img_tool/pkg/tree/treeartifact,img_tool/toolchain,img_tool/tools
+build --deleted_packages=e2e/cc,e2e/cc/base,e2e/cc/custom_standard_library,e2e/cc/patches,e2e/cc/platform,e2e/generic,e2e/generic/build_settings,e2e/generic/extend,e2e/generic/load,e2e/generic/multi_deploy,e2e/generic/platform,e2e/go,e2e/go/customization,e2e/go/image,e2e/go/multiarch,e2e/js,e2e/js/app,e2e/js/platform,e2e/python,e2e/python/platform,e2e/python/requirements,e2e/workspace,img_tool,img_tool/cmd,img_tool/cmd/bes,img_tool/cmd/compress,img_tool/cmd/deploy,img_tool/cmd/dockersave,img_tool/cmd/downloadblob,img_tool/cmd/expandtemplate,img_tool/cmd/img,img_tool/cmd/index,img_tool/cmd/layer,img_tool/cmd/layermeta,img_tool/cmd/manifest,img_tool/cmd/ocilayout,img_tool/cmd/push,img_tool/cmd/registry,img_tool/cmd/validate,img_tool/cmd/validate/layer-presence,img_tool/pkg/api,img_tool/pkg/auth/credential,img_tool/pkg/auth/grpcheaderinterceptor,img_tool/pkg/auth/protohelper,img_tool/pkg/auth/registry,img_tool/pkg/cas,img_tool/pkg/compress,img_tool/pkg/compress/util,img_tool/pkg/containerd,img_tool/pkg/contentmanifest,img_tool/pkg/deployvfs,img_tool/pkg/digestfs,img_tool/pkg/docker,img_tool/pkg/fileopener,img_tool/pkg/load,img_tool/pkg/proto/bazel,img_tool/pkg/proto/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream,img_tool/pkg/proto/bazel/src/main/java/com/google/devtools/build/lib/packages/metrics,img_tool/pkg/proto/bazel/src/main/protobuf,img_tool/pkg/proto/blobcache,img_tool/pkg/proto/build_event_service,img_tool/pkg/proto/remote-apis,img_tool/pkg/proto/remote-apis/build/bazel/remote/execution/v2,img_tool/pkg/proto/remote-apis/build/bazel/semver,img_tool/pkg/push,img_tool/pkg/serve/bes,img_tool/pkg/serve/bes/syncer,img_tool/pkg/serve/blobcache,img_tool/pkg/serve/registry,img_tool/pkg/serve/registry/reapi,img_tool/pkg/serve/registry/s3,img_tool/pkg/serve/registry/upstream,img_tool/pkg/tarcas,img_tool/pkg/tree,img_tool/pkg/tree/merkle,img_tool/pkg/tree/runfiles,img_tool/pkg/tree/treeartifact,img_tool/toolchain,img_tool/tools,pull_tool,pull_tool/cmd/downloadblob,pull_tool/cmd/internal/pull,pull_tool/cmd/pull_tool,pull_tool/pkg/auth/registry,pull_tool/pull/private
+query --deleted_packages=e2e/cc,e2e/cc/base,e2e/cc/custom_standard_library,e2e/cc/patches,e2e/cc/platform,e2e/generic,e2e/generic/build_settings,e2e/generic/extend,e2e/generic/load,e2e/generic/multi_deploy,e2e/generic/platform,e2e/go,e2e/go/customization,e2e/go/image,e2e/go/multiarch,e2e/js,e2e/js/app,e2e/js/platform,e2e/python,e2e/python/platform,e2e/python/requirements,e2e/workspace,img_tool,img_tool/cmd,img_tool/cmd/bes,img_tool/cmd/compress,img_tool/cmd/deploy,img_tool/cmd/dockersave,img_tool/cmd/downloadblob,img_tool/cmd/expandtemplate,img_tool/cmd/img,img_tool/cmd/index,img_tool/cmd/layer,img_tool/cmd/layermeta,img_tool/cmd/manifest,img_tool/cmd/ocilayout,img_tool/cmd/push,img_tool/cmd/registry,img_tool/cmd/validate,img_tool/cmd/validate/layer-presence,img_tool/pkg/api,img_tool/pkg/auth/credential,img_tool/pkg/auth/grpcheaderinterceptor,img_tool/pkg/auth/protohelper,img_tool/pkg/auth/registry,img_tool/pkg/cas,img_tool/pkg/compress,img_tool/pkg/compress/util,img_tool/pkg/containerd,img_tool/pkg/contentmanifest,img_tool/pkg/deployvfs,img_tool/pkg/digestfs,img_tool/pkg/docker,img_tool/pkg/fileopener,img_tool/pkg/load,img_tool/pkg/proto/bazel,img_tool/pkg/proto/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream,img_tool/pkg/proto/bazel/src/main/java/com/google/devtools/build/lib/packages/metrics,img_tool/pkg/proto/bazel/src/main/protobuf,img_tool/pkg/proto/blobcache,img_tool/pkg/proto/build_event_service,img_tool/pkg/proto/remote-apis,img_tool/pkg/proto/remote-apis/build/bazel/remote/execution/v2,img_tool/pkg/proto/remote-apis/build/bazel/semver,img_tool/pkg/push,img_tool/pkg/serve/bes,img_tool/pkg/serve/bes/syncer,img_tool/pkg/serve/blobcache,img_tool/pkg/serve/registry,img_tool/pkg/serve/registry/reapi,img_tool/pkg/serve/registry/s3,img_tool/pkg/serve/registry/upstream,img_tool/pkg/tarcas,img_tool/pkg/tree,img_tool/pkg/tree/merkle,img_tool/pkg/tree/runfiles,img_tool/pkg/tree/treeartifact,img_tool/toolchain,img_tool/tools,pull_tool,pull_tool/cmd/downloadblob,pull_tool/cmd/internal/pull,pull_tool/cmd/pull_tool,pull_tool/pkg/auth/registry,pull_tool/pull/private
 
 common --override_module=rules_img_tool=%workspace%/img_tool
+common --override_module=rules_img_pull_tool=%workspace%/pull_tool
 
 import %workspace%/.bazelrc.common
 

diff --git a/.bcr/pull_tool/metadata.template.json b/.bcr/pull_tool/metadata.template.json
@@ -0,0 +1,15 @@
+{
+    "homepage": "https://github.com/bazel-contrib/rules_img",
+    "maintainers": [
+        {
+            "name": "Malte Poll",
+            "email": "[email protected]",
+            "github": "malt3"
+        }
+    ],
+    "repository": [
+        "github:bazel-contrib/rules_img"
+    ],
+    "versions": [],
+    "yanked_versions": {}
+}
diff --git a/.bcr/pull_tool/presubmit.yml b/.bcr/pull_tool/presubmit.yml
@@ -0,0 +1,14 @@
+bcr_test_module:
+  module_path: "."
+  matrix:
+    platform: ["debian10", "ubuntu2004", "macos", "macos_arm64", "windows", "windows_arm64"]
+    bazel: [7.x, 8.x]
+  tasks:
+    run_tests:
+      name: "Run test module"
+      platform: ${{ platform }}
+      bazel: ${{ bazel }}
+      build_targets:
+        - "//..."
+      test_targets:
+        - "//..."
diff --git a/.bcr/pull_tool/source.template.json b/.bcr/pull_tool/source.template.json
@@ -0,0 +1,4 @@
+{
+    "integrity": "",
+    "url": "https://github.com/{OWNER}/{REPO}/releases/download/{TAG}/rules_img_pull_tool-{TAG}.tar.gz"
+}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -43,7 +43,7 @@ jobs:
         repository-cache: true
         bazelrc: import %workspace%/.github/workflows/ci.bazelrc
     - name: Execute Tests
-      run: bazelisk test //... @rules_img_tool//...
+      run: bazelisk test //... @rules_img_tool//... @rules_img_pull_tool//...
   integration_test_matrix:
     strategy:
       fail-fast: false

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -28,6 +28,9 @@ jobs:
         dist/img_linux_*
         dist/img_darwin_*
         dist/img_windows_*.exe
+        dist/pull_tool_linux_*
+        dist/pull_tool_darwin_*
+        dist/pull_tool_windows_*.exe
       prerelease: false
       tag_name: ${{ inputs.tag_name || github.ref_name }}
     secrets:

diff --git a/BUILD.bazel b/BUILD.bazel
@@ -27,7 +27,24 @@ filegroup(
     visibility = ["//img/private/release:__subpackages__"],
 )
 
+filegroup(
+    name = "pull_tool_source_files",
+    srcs = glob(
+        ["pull_tool/**"],
+        allow_empty = True,
+        exclude = [
+            "pull_tool/.bazelrc.common",
+            "pull_tool/.bazelrc",
+            "pull_tool/.vscode/**",
+            "pull_tool/tools/**",
+        ],
+    ),
+    visibility = ["//img/private/release:__subpackages__"],
+)
+
 exports_files([
     ".bcr/metadata.template.json",
+    ".bcr/pull_tool/metadata.template.json",
     "prebuilt_lockfile.json",
+    "pull_tool_lockfile.json",
 ])
diff --git a/HACKING.md b/HACKING.md
@@ -2,6 +2,8 @@
 
 This guide provides instructions for developers working on rules_img.
 
+**Note**: As of v0.2.6, development has been simplified. You no longer need to manually manage lockfiles or build custom binaries. Instead, use Bazel module overrides to work with source-built versions of the Go tools. See [Development with Source-Built Tools](#development-with-source-built-tools) for details.
+
 ## Development Environment
 
 ### Prerequisites
@@ -126,65 +128,106 @@ cd e2e/go && bazel test //...
 cd e2e/go && bazel run //:push
 ```
 
-### Testing with Prebuilt img Tool
+### Development with Source-Built Tools
 
-When developing rules_img, you may need to test with a prebuilt version of the `img` tool. Since the tool is in a separate `rules_img_tool` module, there are a few approaches:
+When developing rules_img, you can use source-built versions of the Go tools (`img` and `pull_tool`) instead of prebuilt binaries. This is useful for testing changes to the tool implementations or applying patches.
 
-#### Option 1: Local Development with HTTP Server
+#### Setting Up Development Dependencies
 
-Build the tool locally and serve it via HTTP:
+Add dependencies on the tool modules and register the source-built toolchains in your `MODULE.bazel`:
 
-```bash
-# Build the img tool from the rules_img_tool module
-bazel build @rules_img_tool//cmd/img
+```starlark
+# Add dependencies on the tool modules
+bazel_dep(name = "rules_img_tool", version = "<version>", dev_dependency = True)
+bazel_dep(name = "rules_img_pull_tool", version = "<version>", dev_dependency = True)
 
-# Copy to a local directory and serve
-TMPDIR=$(mktemp -d)
-cp bazel-bin/external/rules_img_tool+/cmd/img/img_/img ${TMPDIR}/img
-cd ${TMPDIR} && python3 -m http.server 8000
+# Register source-built toolchain
+register_toolchains(
+    "@rules_img_tool//toolchain:all",
+    dev_dependency = True,
+)
 ```
 
-Then create a custom lockfile (`prebuilt_lockfile.json`):
-
-```json
-[
-    {
-        "version": "v0.2.5",
-        "integrity": "sha256-FG5F8mJuRzvL1oiXCRXyOQ94RvJ+43HH+/yLGbWNvP8=",
-        "os": "linux",
-        "cpu": "amd64",
-        "url_templates": [
-            "http://localhost:8000/img"
-        ]
-    }
-]
-```
+#### Module Override Options
 
-#### Option 2: Airgapped BCR Module
+You can override the tool modules using various Bazel module override mechanisms:
 
-Build a complete local BCR (Bazel Central Registry) module:
+##### Local Development Override
 
-```bash
-# Build the BCR module and distribution directory
-bazel build //img/private/release:bcr
-bazel build //img/private/release/distdir
+For local development with modifications:
 
-# Set environment variables
-export RULES_IMG_BCR=file://$(realpath bazel-bin/img/private/release/bcr.local)
-export DISTDIR=$(realpath bazel-bin/img/private/release/distdir/distdir_/distdir)
+```starlark
+# Override with local directory
+local_path_override(
+    module_name = "rules_img_tool",
+    path = "../img_tool",  # Path to your local checkout
+)
+
+local_path_override(
+    module_name = "rules_img_pull_tool",
+    path = "../pull_tool",
+)
 ```
 
-Then configure your test project's `.bazelrc`:
+##### Git Repository Override
+
+For testing against a specific Git commit or branch:
+
+```starlark
+# Override with Git repository
+git_override(
+    module_name = "rules_img_tool",
+    remote = "https://github.com/your-fork/rules_img.git",
+    strip_prefix = "img_tool",
+    commit = "abc123def456",  # Specific commit
+    # Or use: branch = "feature-branch"
+)
+
+git_override(
+    module_name = "rules_img_pull_tool",
+    remote = "https://github.com/your-fork/rules_img.git",
+    strip_prefix = "pull_tool",
+    commit = "abc123def456",
+)
+```
 
-```bash
-# .bazelrc
-# Use the local BCR first, then fall back to the official registry
-# (you need to replace the placeholder with the values from above).
-common --registry=${RULES_IMG_BCR} --registry=https://bcr.bazel.build/
-common --distdir=${DISTDIR}
+##### Archive Override
+
+For testing with a custom archive:
+
+```starlark
+archive_override(
+    module_name = "rules_img_tool",
+    urls = ["https://github.com/your-fork/rules_img/archive/abc123def456.tar.gz"],
+    integrity = "sha256-...",
+    strip_prefix = "rules_img-abc123def456/img_tool",  # Note: includes img_tool subdirectory
+)
+
+archive_override(
+    module_name = "rules_img_pull_tool",
+    urls = ["https://github.com/your-fork/rules_img/archive/abc123def456.tar.gz"],
+    integrity = "sha256-...",
+    strip_prefix = "rules_img-abc123def456/pull_tool",  # Note: includes pull_tool subdirectory
+)
 ```
 
-This approach provides a complete isolated testing environment with all dependencies.
+##### Single Version Override with Patches
+
+For applying patches to a specific version:
+
+```starlark
+single_version_override(
+    module_name = "rules_img_tool",
+    patches = ["//patches:img_tool_performance.patch"],
+    patch_strip = 2,  # For patches created from rules_img root (strips img_tool/ prefix)
+)
+
+single_version_override(
+    module_name = "rules_img_pull_tool",
+    patches = ["//patches:pull_tool_auth_fix.patch"],
+    patch_strip = 2,  # For patches created from rules_img root (strips pull_tool/ prefix)
+)
+```
 
 ## Documentation
 

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -25,6 +25,17 @@ register_toolchains(
     "@img_toolchain//:all",
 )
 
+pull_tool = use_extension("@rules_img//img/private/prebuilt:prebuilt.bzl", "pull_tool")
+pull_tool.collection(name = "pull_hub_repo")
+pull_tool.from_file(
+    collection = "pull_hub_repo",
+    file = "@rules_img//:pull_tool_lockfile.json",
+)
+use_repo(
+    pull_tool,
+    "pull_hub_repo",
+)
+
 # ✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂
 # only dev_dependencies below this line - rules_img is lean
 # ✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂✂
@@ -38,6 +49,7 @@ bazel_dep(name = "gazelle", version = "0.45.0", dev_dependency = True)
 bazel_dep(name = "hermetic_cc_toolchain", version = "4.0.1", dev_dependency = True)
 bazel_dep(name = "rules_bazel_integration_test", version = "0.34.0", dev_dependency = True)
 bazel_dep(name = "rules_go", version = "0.57.0", dev_dependency = True)
+bazel_dep(name = "rules_img_pull_tool", version = "0.2.5", dev_dependency = True)
 bazel_dep(name = "rules_img_tool", version = "0.2.5", dev_dependency = True)
 bazel_dep(name = "rules_pkg", version = "1.1.0", dev_dependency = True)
 bazel_dep(name = "rules_python", version = "1.6.3", dev_dependency = True)

diff --git a/e2e/cc/MODULE.bazel b/e2e/cc/MODULE.bazel
@@ -1,15 +1,18 @@
 module(name = "cc_e2e")
 
 # BEGIN BAZEL_DEP
-bazel_dep(
-    name = "rules_img",
-    version = "0.2.5",
-)
+bazel_dep(name = "rules_img")
 local_path_override(
     module_name = "rules_img",
     path = "../..",
 )
 
+bazel_dep(name = "rules_img_pull_tool")
+local_path_override(
+    module_name = "rules_img_pull_tool",
+    path = "../../pull_tool",
+)
+
 bazel_dep(name = "rules_img_tool")
 local_path_override(
     module_name = "rules_img_tool",

diff --git a/e2e/generic/MODULE.bazel b/e2e/generic/MODULE.bazel
@@ -7,6 +7,12 @@ local_path_override(
     path = "../..",
 )
 
+bazel_dep(name = "rules_img_pull_tool")
+local_path_override(
+    module_name = "rules_img_pull_tool",
+    path = "../../pull_tool",
+)
+
 bazel_dep(name = "rules_img_tool")
 local_path_override(
     module_name = "rules_img_tool",

diff --git a/e2e/go/MODULE.bazel b/e2e/go/MODULE.bazel
@@ -1,15 +1,18 @@
 module(name = "go_e2e")
 
 # BEGIN BAZEL_DEP
-bazel_dep(
-    name = "rules_img",
-    version = "0.2.5",
-)
+bazel_dep(name = "rules_img")
 local_path_override(
     module_name = "rules_img",
     path = "../..",
 )
 
+bazel_dep(name = "rules_img_pull_tool")
+local_path_override(
+    module_name = "rules_img_pull_tool",
+    path = "../../pull_tool",
+)
+
 bazel_dep(name = "rules_img_tool")
 local_path_override(
     module_name = "rules_img_tool",

diff --git a/e2e/js/MODULE.bazel b/e2e/js/MODULE.bazel
@@ -1,15 +1,18 @@
 module(name = "js_e2e")
 
 # BEGIN BAZEL_DEP
-bazel_dep(
-    name = "rules_img",
-    version = "0.2.5",
-)
+bazel_dep(name = "rules_img")
 local_path_override(
     module_name = "rules_img",
     path = "../..",
 )
 
+bazel_dep(name = "rules_img_pull_tool")
+local_path_override(
+    module_name = "rules_img_pull_tool",
+    path = "../../pull_tool",
+)
+
 bazel_dep(name = "rules_img_tool")
 local_path_override(
     module_name = "rules_img_tool",

diff --git a/e2e/python/MODULE.bazel b/e2e/python/MODULE.bazel
@@ -1,15 +1,18 @@
 module(name = "python_e2e")
 
 # BEGIN BAZEL_DEP
-bazel_dep(
-    name = "rules_img",
-    version = "0.2.5",
-)
+bazel_dep(name = "rules_img")
 local_path_override(
     module_name = "rules_img",
     path = "../..",
 )
 
+bazel_dep(name = "rules_img_pull_tool")
+local_path_override(
+    module_name = "rules_img_pull_tool",
+    path = "../../pull_tool",
+)
+
 bazel_dep(name = "rules_img_tool")
 local_path_override(
     module_name = "rules_img_tool",