From 92b7fa5bbf5c97a449923d659a1577e7b6678052 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Tue, 27 Nov 2018 21:42:13 +0100 Subject: [PATCH] =?UTF-8?q?=E2=80=9Emodule/dockerHelper/loadAndRunContaine?= =?UTF-8?q?r.nix=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module/dockerHelper/loadAndRunContainer.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/module/dockerHelper/loadAndRunContainer.nix b/module/dockerHelper/loadAndRunContainer.nix index 6529c15..e4b9e1e 100644 --- a/module/dockerHelper/loadAndRunContainer.nix +++ b/module/dockerHelper/loadAndRunContainer.nix @@ -1,4 +1,4 @@ -{pkgs, imageName, image, tag, extraRunConfig, containerName? "${imageName}-${tag}"}: +{pkgs, imageName, image, tag, extraRunConfig, containerName? "${imageName}-${tag}", wants ? [], after ? [], serviceType ? "oneshot"}: let imageId= "${imageName}:${tag}"; @@ -9,8 +9,8 @@ in systemd.services."docker-load-run-${containerName}-container" = { description = "Docker load and run ${containerName}-container"; wantedBy = [ "multi-user.target" ]; - wants = [ "docker.service" "local-fs.target" ]; - after = [ "docker.service" "local-fs.target" ]; + wants = [ "docker.service" "local-fs.target" ] ++ wants; + after = [ "docker.service" "local-fs.target" ] ++ after; script = '' if [[ "$(${dockerBin} images -aq ${imageId} 2> /dev/null)" == "" ]]; then @@ -27,7 +27,7 @@ in ''; serviceConfig = { - Type = "oneshot"; + Type = serviceType; }; }; }