diff options
| author |  Googler <noreply@google.com> | 2017-03-03 15:26:32 +0000 |
|---|---|---|
| committer |  Yue Gan <yueg@google.com> | 2017-03-06 09:45:17 +0000 |
| commit | 5ba8257de0be6176c001b28246f225983f454f90 (patch) | |
| tree | 08eccf1fb52d5dbe8ee1944ad926ce5321a6db35 /tools/cpp | |
| parent | 584843e5bb009c38ba215a141b121f6d7b8a33de (diff) | |
Rollback of commit 4af8f5bff567e7cad179fb803070764791353f8a.
*** Reason for rollback ***
Fixing the test, which relied on a magic hidden feature I removed.
*** Original change description ***
Automated [] rollback of commit 5621a2c73337d82fe328069dbb0621e46e9e1c25.
*** Reason for rollback ***
This change broke bazel-docker-tests:
http://ci.bazel.io/job/bazel-docker-tests/BAZEL_VERSION=HEAD,PLATFORM_NAME=docker/457/console
*** Original change description ***
This change adds support for a docker_bundle rule, refactoring a number of interfaces to support shared use with docker_build.
This also fixes "docker load -i <bazel output>", which was broken on newer clients due to a lack of tag data in manifest.json...
***
--
PiperOrigin-RevId: 149110613
MOS_MIGRATED_REVID=149110613
Diffstat (limited to 'tools/cpp')
| -rw-r--r-- | tools/cpp/test/docker_test.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/cpp/test/docker_test.py b/tools/cpp/test/docker_test.py index 8d804cdeb4..a185e27775 100644 --- a/tools/cpp/test/docker_test.py +++ b/tools/cpp/test/docker_test.py @@ -45,7 +45,7 @@ gflags.DEFINE_boolean("verbose", True, "Be verbose.") FLAGS = gflags.FLAGS -LOCAL_IMAGE_PREFIX = "bazel/docker_test:" +LOCAL_IMAGE_PREFIX = "bazel/" def _copy_stream(in_stream, out_stream): @@ -76,11 +76,11 @@ def execute(command, stdout=sys.stdout, stderr=sys.stderr, env=None): def load_image(image): """Load a docker image using the runner provided by docker_build.""" - tag = LOCAL_IMAGE_PREFIX + image.replace("/", "_") + tag = LOCAL_IMAGE_PREFIX + ":".join(image.rsplit("/", 1)) err = StringIO.StringIO() env = copy.deepcopy(os.environ) env["DOCKER"] = FLAGS.docker - ret = execute([image, tag], stderr=err, env=env) + ret = execute([image], stderr=err, env=env) if ret != 0: sys.stderr.write("Error loading image %s (return code: %s):\n" % (image, ret)) |