fraport/fradrive-old
Archived
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(gitlab-ci): ...

Browse Source
This commit is contained in:
Gregor Kleen 2021-09-17 14:29:06 +02:00
parent 2e09c25085
commit 12369dd385
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -6,7 +6,7 @@ workflow:
default: default:
image: image:
name: registry.gitlab.com/fradrive/fradrive/nix-unstable:kkq79z2lyip9wasq9sfd8mgqgifj9prs name: registry.gitlab.com/fradrive/fradrive/nix-unstable:hcdba12p7ajl9xylgmw4kfn6p9c185xy
variables: variables:
NIX_PATH: "nixpkgs=http://nixos.org/channels/nixos-21.05/nixexprs.tar.xz" NIX_PATH: "nixpkgs=http://nixos.org/channels/nixos-21.05/nixexprs.tar.xz"

10
nix/docker/default.nix
View File

@ -125,12 +125,16 @@ let
}; };
in in
{ {
ciDocker = prev.docker-nixpkgs.nix-flakes.overrideAttrs (oldAttrs: { ciDocker = prev.dockerTools.buildImageWithNixDb rec {
name = "uniworx-ci";
inherit created; inherit created;
contents = oldAttrs.contents or [] ++ [ tag = fromImage.imageTag;
fromImage = prev.docker-nixpkgs.nix-unstable;
contents = [
final.bash final.coreutils final.minio-client final.bash final.coreutils final.minio-client
]; ];
}); };
} // mapAttrs (_name: mkUniworxDocker) { } // mapAttrs (_name: mkUniworxDocker) {
uniworxDemoDocker = { isDemo = true; }; uniworxDemoDocker = { isDemo = true; };
uniworxDocker = { isDemo = false; }; uniworxDocker = { isDemo = false; };