Update gitlab-runner image

docker/gitlab-runner/default.nix

@@ -41,7 +41,7 @@ let
 in
 dockerTools.buildImage {
   name = "simonswine/gitlab-ci-runner";
-  tag = "0.3.0";
+  tag = "0.4.0";
 
   copyToRoot = buildEnv {
     name = "image-root";

flake.nix

@@ -22,6 +22,7 @@
           benchstat = pkgs.callPackage ./pkgs/benchstat { };
           cert-updater = pkgs.callPackage ./pkgs/cert-updater { };
           dhclient = pkgs.callPackage ./pkgs/dhclient { };
+          docker-machine = pkgs.callPackage ./pkgs/docker-machine { };
           docker-machine-driver-hetzner = pkgs.callPackage ./pkgs/docker-machine-driver-hetzner { };
           faillint = pkgs.callPackage ./pkgs/faillint { };
           get-focused-x-screen = pkgs.callPackage ./pkgs/get-focused-x-screen { };
@@ -122,9 +123,10 @@
           };
 
         in
-        rec {
+        {
+
           docker = {
-            gitlab-runnerx = pkgs.callPackage ./docker/gitlab-runner { };
+            gitlab-runner = pkgs.callPackage ./docker/gitlab-runner { };
           };
 
           packages = {
@@ -145,6 +147,7 @@
             cloud-init = pkgs.cloud-init;
             containerd = pkgs.containerd;
             dhclient = pkgs.dhclient;
+            docker-machine = pkgs.docker-machine;
             docker-machine-driver-hetzner = pkgs.docker-machine-driver-hetzner;
             faillint = pkgs.faillint;
             g810-led = pkgs.g810-led;

pkgs/docker-machine-driver-hetzner/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "docker-machine-driver-hetzner";
-  version = "3.5.0";
+  version = "5.0.2";
 
   src = fetchFromGitHub rec {
     owner = "JonasProgrammer";
     repo = "docker-machine-driver-hetzner";
     rev = version;
-    sha256 = "Fnfh8q619jzT+mzyh8RGjzaS0qRpXqz7bWm3wwVcFzw=";
+    hash = "sha256-5mSlKedXSHNKnjfx+qVXplReSMZ5SKQBXt9Ct+ivgjk=";
   };
 
-  vendorHash = "sha256-0rKGTO66JVGN/77oZODvtVR8hZBd2JEtt/tjy9/oe8M=";
+  vendorHash = "sha256-NIKjuC1Z18Sf6oCSXJ6L3a4sZ0ft/2SXwVf7elWB1kg=";
 
   subPackages = [ "." ];
 

pkgs/docker-machine/default.nix

@@ -0,0 +1,35 @@
+# This file was generated by go2nix.
+{ lib, buildGoModule, fetchFromGitLab, installShellFiles }:
+
+buildGoModule rec {
+  pname = "machine";
+  version = "0.16.2-gitlab.29";
+
+  src = fetchFromGitLab {
+    rev = "v${version}";
+    owner = "gitlab-org/ci-cd";
+    repo = "docker-machine";
+    hash = "sha256-qX+rHQBFzODuH+h3d+84jqj7dpGcg3PPYD+Smd2xdwc=";
+  };
+
+  doCheck = false;
+
+  vendorHash = "sha256-apI1wUm/idIxsmGgB1bazsVGfAVjEodxd9+UTDhKiPA=";
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = ''
+    pushd contrib/completion
+    installShellCompletion --bash bash/*
+    installShellCompletion --zsh zsh/*
+    popd
+  '';
+
+  meta = with lib; {
+    homepage = "https://docs.docker.com/machine/";
+    description = "Docker Machine is a tool that lets you install Docker Engine on virtual hosts, and manage Docker Engine on the hosts";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ offline tailhook ];
+    platforms = platforms.unix;
+  };
+}