From 76715ebee300d6d4ebecb9e0e7bb5b2942a15f7b Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Mon, 25 May 2020 18:47:40 +0300 Subject: [PATCH] Fix webide docker container --- nix/docker.nix | 5 +++-- nix/pkgs.nix | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/nix/docker.nix b/nix/docker.nix index 5820717b3..8fb005f70 100644 --- a/nix/docker.nix +++ b/nix/docker.nix @@ -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 { inherit name; tag = "latest"; - contents = [ ligo bash ]; + contents = [ ligo bash ] ++ extraContents; config.Entrypoint = name; } diff --git a/nix/pkgs.nix b/nix/pkgs.nix index 23c2abe5a..18f841f79 100644 --- a/nix/pkgs.nix +++ b/nix/pkgs.nix @@ -20,6 +20,9 @@ let pkgs.runCommandNoCC "${pkg.name}-bin" { } "mkdir -p $out/bin; cp -Lr ${pkg}/ligo $out/bin"; + + tmp = pkgs.runCommandNoCC "tmpdir" { } "mkdir -p $out/tmp"; + in pkgs.extend (self: super: { inherit (self.ocamlPackages) ligo ligo-out ligo-tests ligo-doc ligo-coverage; ligo-bin = separateBinary self.ligo-out.bin; @@ -29,6 +32,7 @@ in pkgs.extend (self: super: { ligo-editor-docker = self.callPackage ./docker.nix { ligo = self.ligo-editor; name = "ligo-editor"; + extraContents = [ tmp ]; }; ligo-website = self.callPackage ./ligo-website.nix { inherit (nix-npm-buildpackage) buildNpmPackage;