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

chore(docker): remove semver metadata

Browse Source
This commit is contained in:
Gregor Kleen 2021-09-13 10:40:52 +02:00
parent bbe49cb2ff
commit 1c9fe6e0cb
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nix/docker-demo/default.nix
View File

@ -1,12 +1,7 @@
{ self }: final: prev: { { self }: final: prev: {
uniworxDemoDocker = prev.dockerTools.buildImage { uniworxDemoDocker = prev.dockerTools.buildImage {
name = "uniworx-demo"; name = "uniworx-demo";
tag = tag = (builtins.fromJSON (prev.lib.readFile ./version.json)).version;
let
versionJSON = builtins.fromJSON (prev.lib.readFile ./version.json);
semver = versionJSON.version;
hash = prev.lib.substring 0 8 (self.rev or (prev.lib.removePrefix "sha256-" self.narHash));
in "${semver}+${hash}";
created = created =
let let
fromDate = builtins.readFile (prev.runCommand "date" { nativeBuildInputs = with final; [ coreutils ]; } '' fromDate = builtins.readFile (prev.runCommand "date" { nativeBuildInputs = with final; [ coreutils ]; } ''

2
shell.nix
View File

@ -260,5 +260,5 @@ let
''; '';
in pkgs.mkShell { in pkgs.mkShell {
name = "uni2work"; name = "uni2work";
nativeBuildInputs = [develop inDevelop killallUni2work diffRunning] ++ (with pkgs; [ nodejs-14_x postgresql_12 openldap google-chrome exiftool memcached minio minio-client gup ]) ++ (with pkgs.haskellPackages; [ stack yesod-bin hlint cabal-install weeder profiteur ]); nativeBuildInputs = [develop inDevelop killallUni2work diffRunning] ++ (with pkgs; [ nodejs-14_x postgresql_12 openldap google-chrome exiftool memcached minio minio-client gup skopeo ]) ++ (with pkgs.haskellPackages; [ stack yesod-bin hlint cabal-install weeder profiteur ]);
} }