From 4e60f97fcf162742f0faa88a6e76e5f46cb7fff5 Mon Sep 17 00:00:00 2001 From: Paul Johnston Date: Thu, 29 Feb 2024 20:41:23 -0700 Subject: [PATCH] fix example_tests --- example/BUILD.bazel | 1 + example/docker/WORKSPACE.in | 2 +- example/docker/step3.bzl | 4 ++-- example/oci/WORKSPACE.in | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/example/BUILD.bazel b/example/BUILD.bazel index bf97c55..9d246b6 100644 --- a/example/BUILD.bazel +++ b/example/BUILD.bazel @@ -21,6 +21,7 @@ example_test( srcs = [ "docker/.bazelrc", "docker/.bazelversion", + "docker/.docker/config.json", "docker/.dockerconfig.json", "docker/BUILD.in", "docker/WORKSPACE.in", diff --git a/example/docker/WORKSPACE.in b/example/docker/WORKSPACE.in index c637bea..cc770a8 100644 --- a/example/docker/WORKSPACE.in +++ b/example/docker/WORKSPACE.in @@ -30,7 +30,7 @@ step2.setup_rules_pycross() load("@//:step3.bzl", "step3") -step3.setup_container_base_image() +step3.setup_pycross_image_base_container() step3.setup_pypi_deps() diff --git a/example/docker/step3.bzl b/example/docker/step3.bzl index 33f513a..a379abe 100644 --- a/example/docker/step3.bzl +++ b/example/docker/step3.bzl @@ -13,7 +13,7 @@ load( ) load("@pycross_image//bazel/workspace:step2.bzl", "python3_debian12_image") -def _setup_container_base_image(**kwargs): +def _setup_pycross_image_base_container(**kwargs): digest = kwargs.pop("digest", python3_debian12_image.digest) registry = kwargs.pop("image", python3_debian12_image.registry) repository = kwargs.pop("repository", python3_debian12_image.repository) @@ -43,6 +43,6 @@ def _setup_pypi_deps(): ) step3 = struct( - setup_container_base_image = _setup_container_base_image, + setup_pycross_image_base_container = _setup_pycross_image_base_container, setup_pypi_deps = _setup_pypi_deps, ) diff --git a/example/oci/WORKSPACE.in b/example/oci/WORKSPACE.in index 42906a3..31a3937 100644 --- a/example/oci/WORKSPACE.in +++ b/example/oci/WORKSPACE.in @@ -22,7 +22,7 @@ load("@pycross_image//bazel/workspace:step2.bzl", "step2") step2.setup_rules_pycross() -step2.setup_oci_containers() +step2.setup_pycross_image_base_oci() # -----------------------------------------