From 356ea8bc3ad2ff7f13a896ac505ec8f3191f3d6f Mon Sep 17 00:00:00 2001
From: Sergiusz Bazanski <q3k@hackerspace.pl>
Date: Sun, 21 Jul 2019 23:56:43 +0200
Subject: [PATCH] devtools/bazel-cache: build from source, use docker_push

Change-Id: Ie889372b9a7b439e04c1899c90753349440e727a
---
 .gitignore                        |  2 +-
 WORKSPACE                         | 25 +++++++++++++++++++++++++
 devtools/bazel-cache/BUILD.bazel  | 10 ++++++++++
 devtools/bazel-cache/prod.jsonnet |  2 +-
 4 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 devtools/bazel-cache/BUILD.bazel

diff --git a/.gitignore b/.gitignore
index 34b85ba9..6e45050f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 *swp
-bazel-*
+/bazel-*
 .kubectl
diff --git a/WORKSPACE b/WORKSPACE
index 7b6561d1..439ac1f3 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -21,6 +21,14 @@ http_archive(
     urls = ["https://github.com/bazelbuild/rules_docker/archive/v0.8.1.tar.gz"],
 )
 
+load("@io_bazel_rules_docker//toolchains/docker:toolchain.bzl", docker_toolchain_configure = "toolchain_configure")
+
+# This forces the use of Docker $HOME/.docker configuration.
+docker_toolchain_configure(
+    name = "docker_config",
+    client_config = "",
+)
+
 load(
     "@io_bazel_rules_docker//repositories:repositories.bzl",
     container_repositories = "repositories",
@@ -173,6 +181,23 @@ maven_jar(
     sha1 = "4216af16d38465bbab0f3dff8efa14204f7a399a",
 )
 
+# For devtools/bazel-cache
+
+git_repository(
+    name = "com_github_buchgr_bazel_remote",
+    remote = "https://github.com/buchgr/bazel-remote.git",
+    commit = "a9374e638411da72a2ef2a83f490e61e2d74a976",
+)
+
+# Go image repos for Docker
+
+load(
+    "@io_bazel_rules_docker//go:image.bzl",
+    go_image_repositories = "repositories",
+)
+
+go_image_repositories()
+
 # Go repositories
 
 go_repository(
diff --git a/devtools/bazel-cache/BUILD.bazel b/devtools/bazel-cache/BUILD.bazel
new file mode 100644
index 00000000..2781a594
--- /dev/null
+++ b/devtools/bazel-cache/BUILD.bazel
@@ -0,0 +1,10 @@
+load("@io_bazel_rules_docker//container:container.bzl", "container_push")
+
+container_push(
+    name = "push",
+    image = "@com_github_buchgr_bazel_remote//:bazel-remote-image",
+    format = "Docker",
+    registry = "registry.k0.hswaw.net",
+    repository = "devtools/bazel-cache",
+    tag = "latest",
+)
diff --git a/devtools/bazel-cache/prod.jsonnet b/devtools/bazel-cache/prod.jsonnet
index 9b65e954..b4a9b6e5 100644
--- a/devtools/bazel-cache/prod.jsonnet
+++ b/devtools/bazel-cache/prod.jsonnet
@@ -49,7 +49,7 @@ local kube = import "../../kube/kube.libsonnet";
                     },
                     containers_: {
                         auth: kube.Container("bazel-remote") {
-                            image: "buchgr/bazel-remote-cache",
+                            image: "registry.k0.hswaw.net/devtools/bazel-cache:latest",
                             volumeMounts_: {
                                 data: { mountPath: "/data" },
                             },