ci-root: add docker images to ci-root

This commit is contained in:
Luke Granger-Brown 2020-10-10 21:02:23 +00:00
parent 7f99b80dbe
commit 6b84fe71f7
2 changed files with 6 additions and 3 deletions

View file

@ -9,11 +9,12 @@ let
prefixAttrs = prefix: lib.mapAttrsToList (name: value: { name = "${prefix}-${name}"; path = value; });
ciMachines = prefixAttrs "machine" depot.ops.nixos;
ciPackages = prefixAttrs "pkg" depot.nix.pkgs;
ciDocker = prefixAttrs "docker" ((import ./docker-images.nix).images);
ciOther = prefixAttrs "other" {
twitterchiver-archiver = depot.go.twitterchiver.archiver;
twitterchiver-archiver-docker = depot.go.twitterchiver.archiver.dockerImage;
};
in
pkgs.linkFarm "ci" (ciMachines ++ ciPackages ++ ciOther)
pkgs.linkFarm "ci" (ciMachines ++ ciPackages ++ ciDocker ++ ciOther)

View file

@ -24,8 +24,10 @@ let
${crane} auth login ${name} -u "${value.user}" -p "${value.password}"
'') depot.ops.secrets.deployer.dockerRegistryAuth;
in
pkgs.writeShellScript "push-images" ''
((pkgs.writeShellScript "push-images" ''
${lib.concatStringsSep "\n" authCommands}
${lib.concatStringsSep "\n" pushCommands}
''
'') // {
images = images;
})