From 0d67ebd8cae6360d4ea79bb6768812886453cd6b Mon Sep 17 00:00:00 2001 From: Fuwn Date: Thu, 6 May 2021 12:55:41 -0700 Subject: feat(docker): extends alpine Enables further extensibility, as well, Alpine is only 5 megabytes so the overhead is minimal. --- Makefile.toml | 4 ++-- docker.nix | 15 +++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Makefile.toml b/Makefile.toml index 79804d7..ecb679e 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -74,8 +74,8 @@ command = "docker" args = [ "run", "--name", "Whirlsplash", - # Distributor Hub API - "-p", "6650:6650", "-p", "5673:5673", "-p", "8000:8000", + # API Distributor Hub + "-p", "8000:8000", "-p", "6650:6650", "-p", "5673:5673", "whirlsplash/whirl" ] diff --git a/docker.nix b/docker.nix index 9cd9d6e..56af61e 100644 --- a/docker.nix +++ b/docker.nix @@ -7,15 +7,18 @@ let whirl = callPackage ./default.nix { }; dockerImage = pkg: - pkgs.dockerTools.buildLayeredImage { + pkgs.dockerTools.buildImage { name = "Whirlsplash/whirl"; tag = "latest"; -# fromImage = pkgs.dockerTools.buildImage { -# name = "bash"; -# tag = "latest"; -# contents = pkgs.bashInteractive; -# }; + fromImage = pkgs.dockerTools.pullImage { + imageName = "alpine"; + imageDigest = "sha256:def822f9851ca422481ec6fee59a9966f12b351c62ccb9aca841526ffaa9f748"; + # https://nixos.wiki/wiki/Docker + sha256 = "1z6fh6ry14m5cpcjfg88vn2m36garmgdagr4vfc3pm1z3kph639n"; + finalImageTag = "alpine"; + finalImageName = "3.13.5"; + }; contents = [ pkg ]; -- cgit v1.2.3