Revert "Revert "refactor: upgrade to rules_oci 2.0 (2nd attempt)"" (#64354)

Strum355 · web-flow · commit b9c4e2aae92a · 2024-08-08T09:00:08.000Z
Reverts sourcegraph/sourcegraph#64351

## Test plan

Need to test on main due to main-only CI steps (even with main dry-run)
diff --git a/WORKSPACE b/WORKSPACE
@@ -106,9 +106,9 @@ http_archive(
 # Container rules
 http_archive(
     name = "rules_oci",
-    sha256 = "647f4c6fd092dc7a86a7f79892d4b1b7f1de288bdb4829ca38f74fd430fcd2fe",
-    strip_prefix = "rules_oci-1.7.6",
-    url = "https://github.com/bazel-contrib/rules_oci/releases/download/v1.7.6/rules_oci-v1.7.6.tar.gz",
+    sha256 = "f70f07f9d0d6c275d7ec7d3c7f236d9b552ba3205e8f37df9c1125031cf967cc",
+    strip_prefix = "rules_oci-2.0.0-beta1",
+    url = "https://github.com/bazel-contrib/rules_oci/releases/download/v2.0.0-beta1/rules_oci-v2.0.0-beta1.tar.gz",
 )
 
 http_archive(
@@ -407,15 +407,9 @@ load("@rules_oci//oci:dependencies.bzl", "rules_oci_dependencies")
 
 rules_oci_dependencies()
 
-load("@rules_oci//oci:repositories.bzl", "LATEST_CRANE_VERSION", "oci_register_toolchains")
+load("@rules_oci//oci:repositories.bzl", "oci_register_toolchains")
 
-oci_register_toolchains(
-    name = "oci",
-    crane_version = LATEST_CRANE_VERSION,
-    # Uncommenting the zot toolchain will cause it to be used instead of crane for some tasks.
-    # Note that it does not support docker-format images.
-    # zot_version = LATEST_ZOT_VERSION,
-)
+oci_register_toolchains(name = "oci")
 
 # Optional, for oci_tarball rule
 load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
diff --git a/cmd/appliance/BUILD.bazel b/cmd/appliance/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
 load("//wolfi-images:defs.bzl", "wolfi_base")
 
diff --git a/cmd/batcheshelper/BUILD.bazel b/cmd/batcheshelper/BUILD.bazel
@@ -1,7 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
-load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
+load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball", "pkg_tar")
 load("//dev:go_defs.bzl", "go_test")
 load("//wolfi-images:defs.bzl", "wolfi_base")
 
diff --git a/cmd/blobstore/BUILD.bazel b/cmd/blobstore/BUILD.bazel
@@ -1,7 +1,7 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
 load("//dev:oci_defs.bzl", "oci_image", "oci_tarball")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 
 go_library(
     name = "blobstore_lib",
diff --git a/cmd/bundled-executor/BUILD.bazel b/cmd/bundled-executor/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
 load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
 load("//cmd/server:macro.bzl", "container_dependencies", "dependencies_tars")
diff --git a/cmd/cody-gateway/BUILD.bazel b/cmd/cody-gateway/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
 load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
 
diff --git a/cmd/customer-2315/BUILD.bazel b/cmd/customer-2315/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
 load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
 
diff --git a/cmd/customer-4512/BUILD.bazel b/cmd/customer-4512/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
 load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
 
diff --git a/cmd/embeddings/BUILD.bazel b/cmd/embeddings/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
 
 go_library(
diff --git a/cmd/enterprise-portal/BUILD.bazel b/cmd/enterprise-portal/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
 load("//dev:msp_delivery.bzl", "msp_delivery")
 
diff --git a/cmd/executor-kubernetes/BUILD.bazel b/cmd/executor-kubernetes/BUILD.bazel
@@ -1,5 +1,5 @@
 load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
 load("//cmd/server:macro.bzl", "container_dependencies", "dependencies_tars")
 load("//wolfi-images:defs.bzl", "wolfi_base")
diff --git a/cmd/executor/BUILD.bazel b/cmd/executor/BUILD.bazel
@@ -1,7 +1,7 @@
 load("@bazel_skylib//rules:build_test.bzl", "build_test")
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
 load("//wolfi-images:defs.bzl", "wolfi_base")
 
diff --git a/cmd/executor/vm-image/BUILD.bazel b/cmd/executor/vm-image/BUILD.bazel
@@ -28,6 +28,7 @@ sh_binary(
     env = {
         "SRC_CLI_VERSION": SRC_CLI_VERSION,
     },
+    deps = ["@bazel_tools//tools/bash/runfiles"],
 )
 
 sh_binary(
diff --git a/cmd/executor/vm-image/_ami.build.sh b/cmd/executor/vm-image/_ami.build.sh
@@ -1,6 +1,19 @@
 #!/usr/bin/env bash
 
 set -eu
+
+# --- begin runfiles.bash initialization v3 ---
+# Copy-pasted from the Bazel Bash runfiles library v3.
+set -uo pipefail; set +e; f=bazel_tools/tools/bash/runfiles/runfiles.bash
+# shellcheck disable=SC1090
+source "${RUNFILES_DIR:-/dev/null}/$f" 2>/dev/null || \
+  source "$(grep -sm1 "^$f " "${RUNFILES_MANIFEST_FILE:-/dev/null}" | cut -f2- -d' ')" 2>/dev/null || \
+  source "$0.runfiles/$f" 2>/dev/null || \
+  source "$(grep -sm1 "^$f " "$0.runfiles_manifest" | cut -f2- -d' ')" 2>/dev/null || \
+  source "$(grep -sm1 "^$f " "$0.exe.runfiles_manifest" | cut -f2- -d' ')" 2>/dev/null || \
+  { echo>&2 "ERROR: cannot find $f"; exit 1; }; f=; set -e
+# --- end runfiles.bash initialization v3 ---
+
 ## Setting up inputs/data
 gcloud="$(pwd)/$1" # used in workdir folder, so need an absolute path
 packer="$(pwd)/$2"
diff --git a/cmd/frontend/BUILD.bazel b/cmd/frontend/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
 
 go_library(
diff --git a/cmd/gitserver/BUILD.bazel b/cmd/gitserver/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
 load("//wolfi-images:defs.bzl", "wolfi_base")
 
diff --git a/cmd/loadtest/BUILD.bazel b/cmd/loadtest/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
 
 go_library(
diff --git a/cmd/migrator/BUILD.bazel b/cmd/migrator/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
 
 go_library(
diff --git a/cmd/msp-example/BUILD.bazel b/cmd/msp-example/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
 load("//dev:msp_delivery.bzl", "msp_delivery")
 
diff --git a/cmd/pings/BUILD.bazel b/cmd/pings/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
 load("//dev:msp_delivery.bzl", "msp_delivery")
 
diff --git a/cmd/precise-code-intel-worker/BUILD.bazel b/cmd/precise-code-intel-worker/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
 
 go_library(
diff --git a/cmd/repo-updater/BUILD.bazel b/cmd/repo-updater/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
 load("//wolfi-images:defs.bzl", "wolfi_base")
 
diff --git a/cmd/searcher/BUILD.bazel b/cmd/searcher/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
 load("//wolfi-images:defs.bzl", "wolfi_base")
 
diff --git a/cmd/server/BUILD.bazel b/cmd/server/BUILD.bazel
@@ -1,7 +1,7 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 load("macro.bzl", "container_dependencies", "dependencies_tars")
 load("//wolfi-images:defs.bzl", "wolfi_base")
 
diff --git a/cmd/server/macro.bzl b/cmd/server/macro.bzl
@@ -2,7 +2,7 @@
 Various helpers to help with server image building
 """
 
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 
 def get_last_segment(path):
     """
diff --git a/cmd/symbols/BUILD.bazel b/cmd/symbols/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
 load("//wolfi-images:defs.bzl", "wolfi_base")
 
diff --git a/cmd/syntactic-code-intel-worker/BUILD.bazel b/cmd/syntactic-code-intel-worker/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
 
 go_library(
diff --git a/cmd/telemetry-gateway/BUILD.bazel b/cmd/telemetry-gateway/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
 load("//dev:msp_delivery.bzl", "msp_delivery")
 
diff --git a/cmd/worker/BUILD.bazel b/cmd/worker/BUILD.bazel
@@ -1,7 +1,7 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
 load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 
 go_library(
     name = "worker_lib",
diff --git a/dev/build-tracker/BUILD.bazel b/dev/build-tracker/BUILD.bazel
@@ -2,7 +2,7 @@ load("//dev:go_mockgen.bzl", "go_mockgen")
 load("//dev:go_defs.bzl", "go_test")
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
 load("//dev:msp_delivery.bzl", "msp_delivery")
 
diff --git a/dev/ci/push_all.sh b/dev/ci/push_all.sh
@@ -186,6 +186,7 @@ bazel "${bazelrc[@]}" build \
   --build_event_binary_file_path_conversion=false \
   --build_event_binary_file_upload_mode=wait_for_upload_complete \
   --build_event_publish_all_actions=true \
+  --remote_download_outputs=toplevel \
   ${images}
 
 echo "--- :bash: Generating jobfile - started"
diff --git a/dev/linearhooks/BUILD.bazel b/dev/linearhooks/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
 load("//dev:msp_delivery.bzl", "msp_delivery")
 
diff --git a/dev/oci_defs.bzl b/dev/oci_defs.bzl
@@ -1,6 +1,7 @@
 """OCI bazel defs"""
 
-load("@rules_oci//oci:defs.bzl", _oci_image = "oci_image", _oci_push = "oci_push", _oci_tarball = "oci_tarball")
+load("@rules_oci//oci:defs.bzl", _oci_image = "oci_image", _oci_load = "oci_load", _oci_push = "oci_push")
+load("@rules_pkg//:pkg.bzl", _pkg_tar = "pkg_tar")
 
 REGISTRY_REPOSITORY_PREFIX = "europe-west1-docker.pkg.dev/sourcegraph-security-logging/rules-oci-test/{}"
 # REGISTRY_REPOSITORY_PREFIX = "us.gcr.io/sourcegraph-dev/{}"
@@ -12,7 +13,7 @@ def image_repository(image):
     return REGISTRY_REPOSITORY_PREFIX.format(image)
 
 def oci_tarball(name, **kwargs):
-    _oci_tarball(
+    _oci_load(
         name = name,
         # Don't build this by default with bazel build //... since most oci_tarball
         # targets do not need to be built on CI. This prevents the remote cache from
@@ -67,3 +68,10 @@ oci_image_cross = rule(
         ),
     },
 )
+
+def pkg_tar(name, **kwargs):
+    _pkg_tar(
+        name = name,
+        extension = "tar.gz",
+        **kwargs
+    )
diff --git a/doc/dev/background-information/bazel/containers.md b/doc/dev/background-information/bazel/containers.md
@@ -154,11 +154,8 @@ We can now build this image _locally_ and run those tests as well.
 Example:
 
 ```
-# Create a tarball that can be loaded in Docker of the worker service:
-bazel build //cmd/worker:image_tarball
-
-# Load the image in Docker:
-docker load --input $(bazel cquery //cmd/worker:image_tarball  --output=files)
+# Create and load a tarball that can be loaded in Docker of the worker service:
+bazel run //cmd/worker:image_tarball
 
 # Run the container structure tests
 bazel test //cmd/worker:image_test
diff --git a/doc/dev/background-information/bazel/faq.md b/doc/dev/background-information/bazel/faq.md
@@ -55,11 +55,8 @@ Our containers are only built for `linux/amd64`, therefore we need to cross-comp
 Example:
 
 ```
-# Create a tarball that can be loaded in Docker of the worker service:
-bazel build //cmd/worker:image_tarball
-
-# Load the image in Docker:
-docker load --input $(bazel cquery //cmd/worker:image_tarball  --output=files)
+# Create and load a tarball that can be loaded in Docker of the worker service:
+bazel run //cmd/worker:image_tarball
 ```
 
 You can also use the same configuration flag to run the container tests on MacOS:
diff --git a/doc/dev/background-information/sg/index.md b/doc/dev/background-information/sg/index.md
@@ -186,8 +186,7 @@ env:
 commands:
   gitserver:
     install: |
-      bazel build //cmd/gitserver:image_tarball && \
-      docker load --input $(bazel cquery //cmd/gitserver:image_tarball --output=files)
+      bazel run //cmd/gitserver:image_tarball
   gitserver-0:
     cmd: |
       docker inspect gitserver-${GITSERVER_INDEX} >/dev/null 2>&1 && docker stop gitserver-${GITSERVER_INDEX}
diff --git a/docker-images/appliance-frontend/BUILD.bazel b/docker-images/appliance-frontend/BUILD.bazel
@@ -1,5 +1,5 @@
 load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
 load("//wolfi-images:defs.bzl", "wolfi_base")
 
diff --git a/docker-images/cadvisor/BUILD.bazel b/docker-images/cadvisor/BUILD.bazel
@@ -1,6 +1,6 @@
 load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 load("//wolfi-images:defs.bzl", "wolfi_base")
 
 filegroup(
diff --git a/docker-images/codeinsights-db/BUILD.bazel b/docker-images/codeinsights-db/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@container_structure_test//:defs.bzl", "container_structure_test")
 load("@rules_pkg//:mappings.bzl", "pkg_attributes", "pkg_files")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
 load("//wolfi-images:defs.bzl", "wolfi_base")
 
diff --git a/docker-images/dind/BUILD.bazel b/docker-images/dind/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@aspect_bazel_lib//lib:expand_template.bzl", "expand_template")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
 
 expand_template(
diff --git a/docker-images/executor-vm/BUILD.bazel b/docker-images/executor-vm/BUILD.bazel
@@ -1,5 +1,5 @@
 load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("//dev:oci_defs.bzl", "pkg_tar")
 
 pkg_tar(
     name = "src-cli",
diff --git a/docker-images/grafana/BUILD.bazel b/docker-images/grafana/BUILD.bazel
diff --git a/docker-images/indexed-searcher/BUILD.bazel b/docker-images/indexed-searcher/BUILD.bazel
diff --git a/docker-images/jaeger-all-in-one/BUILD.bazel b/docker-images/jaeger-all-in-one/BUILD.bazel
diff --git a/docker-images/opentelemetry-collector/BUILD.bazel b/docker-images/opentelemetry-collector/BUILD.bazel
diff --git a/docker-images/postgres-12-alpine/BUILD.bazel b/docker-images/postgres-12-alpine/BUILD.bazel
diff --git a/docker-images/postgres_exporter/BUILD.bazel b/docker-images/postgres_exporter/BUILD.bazel
diff --git a/docker-images/prometheus/BUILD.bazel b/docker-images/prometheus/BUILD.bazel
diff --git a/docker-images/redis-cache/BUILD.bazel b/docker-images/redis-cache/BUILD.bazel
diff --git a/docker-images/redis-store/BUILD.bazel b/docker-images/redis-store/BUILD.bazel
diff --git a/docker-images/search-indexer/BUILD.bazel b/docker-images/search-indexer/BUILD.bazel
diff --git a/docker-images/sg/BUILD.bazel b/docker-images/sg/BUILD.bazel
diff --git a/docker-images/syntax-highlighter/BUILD.bazel b/docker-images/syntax-highlighter/BUILD.bazel
diff --git a/docker-images/syntax-highlighter/crates/scip-syntax/BUILD.bazel b/docker-images/syntax-highlighter/crates/scip-syntax/BUILD.bazel
diff --git a/internal/appliance/frontend/maintenance/BUILD.bazel b/internal/appliance/frontend/maintenance/BUILD.bazel
diff --git a/internal/version/BUILD.bazel b/internal/version/BUILD.bazel
diff --git a/sg.config.yaml b/sg.config.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-load("@rules_pkg//:pkg.bzl", "pkg_tar")`
	`1`	`+load("//dev:oci_defs.bzl", "pkg_tar")`
`2`	`2`	`load("@container_structure_test//:defs.bzl", "container_structure_test")`
`3`	`3`	`load("//dev:oci_defs.bzl", "image_repository", "oci_image", "oci_push", "oci_tarball")`
`4`	`4`	`load("//cmd/server:macro.bzl", "container_dependencies", "dependencies_tars")`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ sh_binary(`
`28`	`28`	`env = {`
`29`	`29`	`"SRC_CLI_VERSION": SRC_CLI_VERSION,`
`30`	`30`	`},`
	`31`	`+ deps = ["@bazel_tools//tools/bash/runfiles"],`
`31`	`32`	`)`
`32`	`33`
`33`	`34`	`sh_binary(`