maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(build-image): Simplify wrapper build & remove layer grouping

Browse source 
Simplifies the wrapper script used to invoke Nix builds from Nixery to
just contain the essentials, since the layer grouping logic is moving
into the server itself.
This commit is contained in:
Vincent Ambo 2019-09-29 22:58:52 +01:00 • committed by Vincent Ambo
parent 712b38cbbc
commit 0898d8a961
5 changed files with 19 additions and 450 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tools/nixery/default.nix
View file

@ -17,11 +17,7 @@
with pkgs;
let buildImage = import ./build-image {
srcType = "path";
srcArgs = <nixpkgs>;
};
in rec {
rec {
# Go implementation of the Nixery server which implements the
# container registry interface.
#
@ -30,9 +26,8 @@ in rec {
# data dependencies.
nixery-server = callPackage ./server { };
# Implementation of the image building & layering logic
nixery-build-image = buildImage.wrapper;
nixery-group-layers = buildImage.groupLayers;
# Implementation of the Nix image building logic
nixery-build-image = import ./build-image { inherit pkgs; };
# Use mdBook to build a static asset page which Nixery can then
# serve. This is primarily used for the public instance at