Merge pull request #61 from bazelbuild/drop-legacy

In an effort to start simplifying these rules…

Author: mattmoor

docker/build.bzl

@@ -314,7 +314,7 @@ def _docker_build_impl(ctx):
   ] + _get_layers(ctx, ctx.attr.base, ctx.files.base)
 
   # Generate the incremental load statement
-  _incr_load(ctx, layers, {tag_name: {"name": name, "id": identifier}
+  _incr_load(ctx, layers, {tag_name: {"id": identifier}
                            for tag_name in tags},
              ctx.outputs.executable)
 

docker/incremental_load.sh.tpl

@@ -22,16 +22,6 @@ RUNFILES="${PYTHON_RUNFILES:-${BASH_SOURCE[0]}.runfiles}"
 
 DOCKER="${DOCKER:-docker}"
 
-FULL_DOCKER_VERSION=$(docker version -f {{.Server.Version}} 2> /dev/null \
-    || echo "1.5.0")
-DOCKER_MAJOR_VERSION=$(echo "$FULL_DOCKER_VERSION" | awk -F\. '{ print $1 }')
-DOCKER_MINOR_VERSION=$(echo "$FULL_DOCKER_VERSION" | awk -F\. '{ print $2 }')
-if [ "$DOCKER_MAJOR_VERSION" -eq "1" ] && [ "$DOCKER_MINOR_VERSION" -lt "10" ]; then
-  LEGACY_DOCKER=true
-else
-  LEGACY_DOCKER=false
-fi
-
 # List all images identifier (only the identifier) from the local
 # docker registry.
 IMAGES="$("${DOCKER}" images -aq)"
@@ -42,34 +32,22 @@ IMAGE_LEN=$(for i in $IMAGES; do echo -n $i | wc -c; done | sort -g | head -1 |
 function incr_load() {
   # Load a layer if and only if the layer is not in "$IMAGES", that is
   # in the local docker registry.
-  if [ "$LEGACY_DOCKER" = true ]; then
-    name=$(cat ${RUNFILES}/$1)
-  else
-    name=$(cat ${RUNFILES}/$2)
-  fi
+  name=$(cat ${RUNFILES}/$1)
 
   if (echo "$IMAGES" | grep -q ^${name:0:$IMAGE_LEN}$); then
     echo "Skipping $name, already loaded."
   else
     echo "Loading $name..."
-    "${DOCKER}" load -i ${RUNFILES}/$3
+    "${DOCKER}" load -i ${RUNFILES}/$2
   fi
 }
 
 function tag_layer() {
-  if [ "$LEGACY_DOCKER" = true ]; then
-    name=$(cat ${RUNFILES}/$2)
-  else
-    name=$(cat ${RUNFILES}/$3)
-  fi
+  name=$(cat ${RUNFILES}/$2)
 
   TAG="$1"
   echo "Tagging ${name} as ${TAG}"
-  if [ "$LEGACY_DOCKER" = true ]; then
-    "${DOCKER}" tag -f ${name} ${TAG}
-  else
-    "${DOCKER}" tag sha256:${name} ${TAG}
-  fi
+  "${DOCKER}" tag sha256:${name} ${TAG}
 }
 
 function read_variables() {

docker/layers.bzl

@@ -86,19 +86,17 @@ def incremental_load(ctx, layers, images, output, stamp=False):
               "read_variables %s" % _get_runfile_path(ctx, f)
               for f in stamp_files]),
           "%{load_statements}": "\n".join([
-              "incr_load '%s' '%s' '%s'" % (_get_runfile_path(ctx, l["name"]),
-                                            _get_runfile_path(ctx, l["id"]),
-                                            _get_runfile_path(ctx, l["layer"]))
+              "incr_load '%s' '%s'" % (_get_runfile_path(ctx, l["id"]),
+                                       _get_runfile_path(ctx, l["layer"]))
               # The last layer is the first in the list of layers.
               # We reverse to load the layer from the parent to the child.
               for l in reverse(layers)]),
           "%{tag_statements}": "\n".join([
-              "tag_layer \"%s\" '%s' '%s'" % (
+              "tag_layer \"%s\" '%s'" % (
                   # Turn stamp variable references into bash variables.
                   # It is notable that the only legal use of '{' in a
                   # tag would be for stamp variables, '$' is not allowed.
                   img if not stamp else img.replace("{", "${"),
-                  _get_runfile_path(ctx, images[img]["name"]),
                   _get_runfile_path(ctx, images[img]["id"]))
               for img in images
           ])