From 104c930040ab081f6e24aad95a7df71339d8e6d4 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Sat, 9 Nov 2019 14:30:48 +0000
Subject: chore(build): Use significantly fewer layers for Nixery itself

Nixery itself is built with the buildLayeredImage system, which takes
some time to create large numbers of layers.

This adjusts the default number of image layers from 96 to 20.

Additionally Nixery's image is often loaded with `docker load -i`,
which ignores layer cache hits anyways.

Additionaly the CI build is configured to use only 1, which speeds up
CI runs.
---
 tools/nixery/.travis.yml | 2 +-
 tools/nixery/default.nix | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'tools')

diff --git a/tools/nixery/.travis.yml b/tools/nixery/.travis.yml
index 72b2a657b3..b0a2b3f997 100644
--- a/tools/nixery/.travis.yml
+++ b/tools/nixery/.travis.yml
@@ -15,7 +15,7 @@ before_script:
   - cachix use nixery
 script:
   - test -z $(gofmt -l server/ build-image/)
-  - nix-build | cachix push nixery
+  - nix-build --arg maxLayers 1 | cachix push nixery
 
   # This integration test makes sure that the container image built
   # for Nixery itself runs fine in Docker, and that images pulled
diff --git a/tools/nixery/default.nix b/tools/nixery/default.nix
index af1ec904bf..44ac7313ad 100644
--- a/tools/nixery/default.nix
+++ b/tools/nixery/default.nix
@@ -14,7 +14,8 @@
 
 { pkgs ? import <nixpkgs> { }
 , preLaunch ? ""
-, extraPackages ? [] }:
+, extraPackages ? []
+, maxLayers ? 20 }:
 
 with pkgs;
 
@@ -92,7 +93,8 @@ in rec {
   in dockerTools.buildLayeredImage {
     name = "nixery";
     config.Cmd = [ "${nixery-launch-script}/bin/nixery" ];
-    maxLayers = 96;
+
+    inherit maxLayers;
     contents = [
       bashInteractive
       cacert
-- 
cgit 1.4.1