balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix webide docker container

Browse Source
This commit is contained in:
Alexander Bantyev 2020-05-25 18:47:40 +03:00
parent 2a9a628861
commit 76715ebee3
Signed by: balsoft
GPG Key ID: E081FF12ADCB4AD5
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nix/docker.nix
View File

@ -1,7 +1,8 @@
{ dockerTools, writeShellScriptBin, runCommand, mcpp, bash, coreutils, ligo, name ? "ligo" }: { dockerTools, writeShellScriptBin, runCommand, mcpp, bash, coreutils, ligo
, name ? "ligo", extraContents ? [ ] }:
dockerTools.buildLayeredImage { dockerTools.buildLayeredImage {
inherit name; inherit name;
tag = "latest"; tag = "latest";
contents = [ ligo bash ]; contents = [ ligo bash ] ++ extraContents;
config.Entrypoint = name; config.Entrypoint = name;
} }

4
nix/pkgs.nix
View File

@ -20,6 +20,9 @@ let
pkgs.runCommandNoCC "${pkg.name}-bin" { } pkgs.runCommandNoCC "${pkg.name}-bin" { }
"mkdir -p $out/bin; cp -Lr ${pkg}/ligo $out/bin"; "mkdir -p $out/bin; cp -Lr ${pkg}/ligo $out/bin";
tmp = pkgs.runCommandNoCC "tmpdir" { } "mkdir -p $out/tmp";
in pkgs.extend (self: super: { in pkgs.extend (self: super: {
inherit (self.ocamlPackages) ligo ligo-out ligo-tests ligo-doc ligo-coverage; inherit (self.ocamlPackages) ligo ligo-out ligo-tests ligo-doc ligo-coverage;
ligo-bin = separateBinary self.ligo-out.bin; ligo-bin = separateBinary self.ligo-out.bin;
@ -29,6 +32,7 @@ in pkgs.extend (self: super: {
ligo-editor-docker = self.callPackage ./docker.nix { ligo-editor-docker = self.callPackage ./docker.nix {
ligo = self.ligo-editor; ligo = self.ligo-editor;
name = "ligo-editor"; name = "ligo-editor";
extraContents = [ tmp ];
}; };
ligo-website = self.callPackage ./ligo-website.nix { ligo-website = self.callPackage ./ligo-website.nix {
inherit (nix-npm-buildpackage) buildNpmPackage; inherit (nix-npm-buildpackage) buildNpmPackage;