commit c3c876462b1884d77e7b3d41740b07977a27c1e6 · pyrox.dev/nixpkgs

+14 -8

nixos/tests/traefik.nix

···

       11
       11
        
             environment.systemPackages = [ pkgs.curl ];

     

       12
       12
        
           };

     

       13
       13
        
           traefik = { config, pkgs, ... }: {

     

       14
       14
       -
             virtualisation.oci-containers.containers.nginx = {

     

       15
       15
       -
               extraOptions = [

     

       16
       16
       -
                 "-l" "traefik.enable=true"

     

       17
       17
       -
                 "-l" "traefik.http.routers.nginx.entrypoints=web"

     

       18
       18
       -
                 "-l" "traefik.http.routers.nginx.rule=Host(`nginx.traefik.test`)"

     

       19
       19
       -
               ];

     

       20
       20
       -
               image = "nginx-container";

     

       21
       21
       -
               imageFile = pkgs.dockerTools.examples.nginx;

     

       14
       14
       +
             virtualisation.oci-containers = {

     

       15
       15
       +
               backend = "docker";

     

       16
       16
       +
               containers.nginx = {

     

       17
       17
       +
                 extraOptions = [

     

       18
       18
       +
                   "-l"

     

       19
       19
       +
                   "traefik.enable=true"

     

       20
       20
       +
                   "-l"

     

       21
       21
       +
                   "traefik.http.routers.nginx.entrypoints=web"

     

       22
       22
       +
                   "-l"

     

       23
       23
       +
                   "traefik.http.routers.nginx.rule=Host(`nginx.traefik.test`)"

     

       24
       24
       +
                 ];

     

       25
       25
       +
                 image = "nginx-container";

     

       26
       26
       +
                 imageFile = pkgs.dockerTools.examples.nginx;

     

       27
       27
       +
               };

     

       22
       28
        
             };

     

       23
       29
        
       

     

       24
       30
        
             networking.firewall.allowedTCPPorts = [ 80 ];

+15 -14

pkgs/servers/traefik/default.nix

···

       1
       1
       -
       { lib, fetchzip, buildGoModule, go-bindata, nixosTests }:

     

       1
       1
       +
       { lib, fetchFromGitHub, buildGoModule, nixosTests }:

     

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "traefik";

     

       5
       5
       -
         version = "2.6.3";

     

       5
       5
       +
         version = "2.7.1";

     

       6
       6
        
       

     

       7
       7
       -
         src = fetchzip {

     

       8
       8
       -
           url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";

     

       9
       9
       -
           sha256 = "sha256-OaKgX3qwiJM/EPprV1r3CbUnxOaWl7BTMcS5v+tmHoo=";

     

       10
       10
       -
           stripRoot = false;

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "traefik";

     

       9
       9
       +
           repo = "traefik";

     

       10
       10
       +
           rev = "v${version}";

     

       11
       11
       +
           sha256 = "sha256-uTE0Z7lgxKNq1wQSMUSp9dMfxV+aIm7cwYSkZBUdnug=";

     

       11
       12
        
         };

     

       12
       13
        
       

     

       13
       13
       -
         vendorSha256 = "sha256-tqrfCpZ/fRYZBZ/SBAvvJebLBeD2M/AVJEPiseehJHY=";

     

       14
       14
       +
         vendorSha256 = "sha256-WlLntYrXs1kOu26yNeZI1xpb6FsHPiA/bNzaxCZTG4Y=";

     

       14
       15
        
       

     

       15
       16
        
         subPackages = [ "cmd/traefik" ];

     

       16
       17
        
       

     

       17
       17
       -
         nativeBuildInputs = [ go-bindata ];

     

       18
       18
       -
       

     

       19
       19
       -
         passthru.tests = { inherit (nixosTests) traefik; };

     

       20
       20
       -
       

     

       21
       18
        
         preBuild = ''

     

       22
       19
        
           go generate

     

       23
       20
        
       

     

       24
       21
        
           CODENAME=$(awk -F "=" '/CODENAME=/ { print $2}' script/binary)

     

       25
       22
        
       

     

       26
       26
       -
           buildFlagsArray+=("-ldflags=\

     

       27
       27
       -
             -X github.com/traefik/traefik/v2/pkg/version.Version=${version} \

     

       28
       28
       -
             -X github.com/traefik/traefik/v2/pkg/version.Codename=$CODENAME")

     

       23
       23
       +
           buildFlagsArray+=("-ldflags= -s -w \

     

       24
       24
       +
             -X github.com/traefik/traefik/v${lib.versions.major version}/pkg/version.Version=${version} \

     

       25
       25
       +
             -X github.com/traefik/traefik/v${lib.versions.major version}/pkg/version.Codename=$CODENAME")

     

       29
       26
        
         '';

     

       27
       27
       +
       

     

       28
       28
       +
         doCheck = false;

     

       29
       29
       +
       

     

       30
       30
       +
         passthru.tests = { inherit (nixosTests) traefik; };

     

       30
       31
        
       

     

       31
       32
        
         meta = with lib; {

     

       32
       33
        
           homepage = "https://traefik.io";