Merge pull request #81361 from marsam/update-docker-slim

docker-slim: 1.26.1 -> 1.27.0
This commit is contained in:
Mario Rodas 2020-03-02 07:58:42 -05:00 committed by GitHub
commit 25cd7e987b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -4,26 +4,17 @@
, makeWrapper , makeWrapper
}: }:
let buildGoPackage rec {
version = "1.26.1";
rev = "2ec04e169b12a87c5286aa09ef44eac1cea2c7a1";
in buildGoPackage rec {
pname = "docker-slim"; pname = "docker-slim";
inherit version; version = "1.27.0";
goPackagePath = "github.com/docker-slim/docker-slim"; goPackagePath = "github.com/docker-slim/docker-slim";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "docker-slim"; owner = "docker-slim";
repo = "docker-slim"; repo = "docker-slim";
inherit rev; rev = version;
# fetchzip yields a different hash on Darwin because `use-case-hack` sha256 = "1pd9sz981qgr5lx6ikrhdp0n21nyrnpjpnyl8i4r2jx35zr8b5q8";
sha256 =
if stdenv.isDarwin
then "0j72rn6qap78qparrnslxm3yv83mzy1yc7ha0crb4frwkzmspyvf"
else "01bjb14z7yblm7qdqrx1j2pw5x5da7a6np4rkzay931gly739gbh";
}; };
subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ];
@ -32,20 +23,12 @@ in buildGoPackage rec {
makeWrapper makeWrapper
]; ];
# docker-slim vendorized logrus files in different directories, which buildFlagsArray = [
# conflicts on case-sensitive filesystems ''-ldflags=
preBuild = stdenv.lib.optionalString stdenv.isLinux '' -s -w -X ${goPackagePath}/pkg/version.appVersionTag=${version}
mv go/src/${goPackagePath}/vendor/github.com/Sirupsen/logrus/* \ -X ${goPackagePath}/pkg/version.appVersionRev=${src.rev}
go/src/${goPackagePath}/vendor/github.com/sirupsen/logrus/ ''
''; ];
buildFlagsArray =
let
ldflags = "-ldflags=-s -w " +
"-X ${goPackagePath}/pkg/version.appVersionTag=${version} " +
"-X ${goPackagePath}/pkg/version.appVersionRev=${rev}";
in
[ ldflags ];
# docker-slim tries to create its state dir next to the binary (inside the nix # docker-slim tries to create its state dir next to the binary (inside the nix
# store), so we set it to use the working directory at the time of invocation # store), so we set it to use the working directory at the time of invocation