on master help sign in
specify tag from version
commit945cfef642de7a923c4df6d5c681dc1e31a73c8c authorDan Bornside <dan.bornside@obsidian.systems> dateFri 6 Sep 2019, 14:15 (7 years ago) parentfe233ff
1 file changed+3−4
default.nix+3−4
default.nix+3−4
@@ -237,7 +237,7 @@ in rec {
237237 };
238238 };
239239
240− dockerImage = args@{exe, name}: let
240+ dockerImage = args@{exe, name, version}: let
241241 dockerImageSetupScript = nixpkgs.dockerTools.shellScript "dockersetup.sh" ''
242242 set -ex
243243
@@ -256,6 +256,7 @@ in rec {
256256
257257 in nixpkgs.dockerTools.buildImage {
258258 name = name;
259+ tag = version;
259260 contents = [ nixpkgs.iana-etc nixpkgs.cacert ];
260261 runAsRoot = dockerImageSetupScript;
261262 keepContentsDirlinks = true;
@@ -263,8 +264,6 @@ in rec {
263264
264265 Env = [
265266 ("PATH=" + builtins.concatStringsSep(":")([
266− "${nixpkgs.stdenv.shellPackage}/bin"
267− "${nixpkgs.coreutils}/bin"
268267 "/var/run/backend"
269268 ]))
270269 ];
@@ -392,7 +391,7 @@ in rec {
392391 server = args@{ hostName, adminEmail, routeHost, enableHttps, version }:
393392 server (args // { exe = linuxExe version; });
394393 dockerImage = args@{ name, version }:
395− dockerImage { name = name; exe = linuxExe version; };
394+ dockerImage (args // { exe = linuxExe version; });
396395 obelisk = import (base + "/.obelisk/impl") {};
397396 };
398397 haskellPackageSets = {