refactor: no registry oci_image

.bazelrc

@@ -5,6 +5,7 @@
 build --incompatible_strict_action_env
 build --nolegacy_external_runfiles
 test --test_env=DOCKER_HOST
+startup --host_jvm_args=-DBAZEL_TRACK_SOURCE_DIRECTORIES=1
 
 # Load any settings specific to the current user.
 # .bazelrc.user should appear in .gitignore so that settings are not shared with team members

.github/workflows/ci.yaml

@@ -59,21 +59,15 @@ jobs:
         bazelversion: ${{ fromJSON(needs.matrix-prep-bazelversion.outputs.bazelversions) }}
         folder:
           - .
-          - e2e/custom_registry
           - e2e/wasm
           - e2e/smoke
-          - e2e/crane_as_registry
           - e2e/pull
 
         bzlmodEnabled: [true, false]
         exclude:
           # macos is expensive (billed at 10X) so don't test these
-          - os: macos-latest 
-            folder: e2e/custom_registry
           - os: macos-latest 
             folder: e2e/wasm
-          - os: macos-latest 
-            folder: e2e/crane_as_registry
           - os: macos-latest 
             folder: e2e/pull
           - os: macos-latest
@@ -85,9 +79,6 @@ jobs:
           - bazelversion: 5.3.2
             bzlmodEnabled: true
           # TODO: fix
-          - folder: e2e/custom_registry
-            bzlmodEnabled: true
-          # TODO: fix
           - folder: e2e/wasm
             bzlmodEnabled: true
     # Steps represent a sequence of tasks that will be executed as part of the job

MODULE.bazel

@@ -13,9 +13,9 @@ bazel_dep(name = "platforms", version = "0.0.5")
 
 oci = use_extension("//oci:extensions.bzl", "oci")
 oci.toolchains(crane_version = "v0.18.0")
-use_repo(oci, "oci_auth_config", "oci_crane_registry_toolchains", "oci_crane_toolchains")
+use_repo(oci, "oci_auth_config", "oci_crane_toolchains")
 
-register_toolchains("@oci_crane_toolchains//:all", "@oci_crane_registry_toolchains//:all")
+register_toolchains("@oci_crane_toolchains//:all")
 
 bazel_dep(name = "rules_pkg", version = "0.7.0", dev_dependency = True)
 bazel_dep(name = "gazelle", version = "0.29.0", dev_dependency = True, repo_name = "bazel_gazelle")

README.md

@@ -66,13 +66,6 @@ rules_oci does not contain language-specific rules, but we do have limited docum
 There are some generic examples of usage in the [examples](https://github.com/bazel-contrib/rules_oci/tree/main/examples) folder.
 Note that these examples rely on the setup code in the `/WORKSPACE` file in the root of this repo.
 
-### Choosing between zot or crane as the local registry
-
-rules_oci supports two different registry implementation for the temporary storage within actions spawned by bazel.
-
-1. By default we recommend using `zot` as it stores blobs on disk, however it doesn't support `Docker`-format images.
-2. `crane` is a better alternative as it supports both `OCI` and `Docker` formats which is required to make images with `Docker` media types work. However, it might not support everything that zot does.
-
 ## Public API Docs
 
 ### Build Base images

WORKSPACE

@@ -13,12 +13,11 @@ stardoc_repositories()
 load("//oci:dependencies.bzl", "rules_oci_dependencies")
 rules_oci_dependencies()
 
-load("//oci:repositories.bzl", "LATEST_CRANE_VERSION", "LATEST_ZOT_VERSION", "oci_register_toolchains")
+load("//oci:repositories.bzl", "LATEST_CRANE_VERSION", "oci_register_toolchains")
 
 oci_register_toolchains(
     name = "oci",
-    crane_version = LATEST_CRANE_VERSION,
-    zot_version = LATEST_ZOT_VERSION,
+    crane_version = LATEST_CRANE_VERSION
 )
 
 load("//cosign:repositories.bzl", "cosign_register_toolchains")

docs/release.md

@@ -11,7 +11,7 @@ rules_oci ought to be tested against runtimes such as podman to diversify the co
 Just copy-paste this command into the terminal to run the tests
 
 ```bash
-for dir in "." "e2e/smoke" "e2e/custom_registry" "e2e/crane_as_registry"; do
+for dir in "." "e2e/smoke"; do
     (cd "$dir" && bazel test //... || (echo "tests failed." && exit 1))
 done
 echo "ALL TESTS PASSED"

docs/rust.md

@@ -98,10 +98,7 @@ load("@rules_oci//oci:repositories.bzl", "LATEST_CRANE_VERSION", "oci_register_t
 
 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,
+    crane_version = LATEST_CRANE_VERSION
 )
 
 # Pull distroless image

e2e/convert_docker_tarball/BUILD.bazel

@@ -6,7 +6,6 @@ sh_binary(
     name = "convert",
     srcs = ["convert.bash"],
     data = [
-        "@oci_crane_registry_toolchains//:current_toolchain",
         "@oci_crane_toolchains//:current_toolchain",
     ],
 )
@@ -20,13 +19,11 @@ run_binary(
         "$@",
         "$(location :image.tar)",
         "$(CRANE_BIN)",
-        "$(LAUNCHER_WRAPPER)",
     ],
     out_dirs = ["oci"],
     tool = ":convert",
     toolchains = [
         "@oci_crane_toolchains//:current_toolchain",
-        "@oci_crane_registry_toolchains//:current_toolchain",
     ],
 )
 

e2e/convert_docker_tarball/convert.bash

@@ -20,17 +20,22 @@ export HOME="$TMP"
 readonly OUTPUT="${1}"
 readonly TARBALL="${2}"
 readonly CRANE="${RUNFILES}/${3#"external/"}"
-readonly REGISTRY_LAUNCHER=${RUNFILES}/${4#"external/"}
 
 
 # Launch a registry instance at a random port
-source "${REGISTRY_LAUNCHER}"
-REGISTRY=$(start_registry $TMP $TMP/output.log)
-trap "stop_registry ${TMP}" EXIT
-
+output=$(mktemp)
+$CRANE registry serve --address=localhost:0 >> $output 2>&1 &
+timeout=$((SECONDS+10))
+while [ "${SECONDS}" -lt "${timeout}" ]; do
+    port="$(cat $output | sed -nr 's/.+serving on port ([0-9]+)/\1/p')"
+    if [ -n "${port}" ]; then
+        break
+    fi
+done
+REGISTRY="localhost:$port"
+echo "Registry is running at ${REGISTRY}"
 readonly REPOSITORY="${REGISTRY}/local" 
 
-
 REF=$(mktemp)
 "${CRANE}" push "${TARBALL}" "${REPOSITORY}" --image-refs="${REF}"