diff options
| author | gfrascadorio <gfrascadorio@tutanota.com> | 2021-04-25 20:43:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-26 02:43:09 +0200 |
| commit | a54bc9b671b0ff938075c026180b2ec04b53c8b2 (patch) | |
| tree | 697f30ff19f65a212330041cbc8f7daafd5a0f91 /pkgs/applications/virtualization | |
| parent | 1f0fb586c3f9f02461c26ded9f84f8afe2555630 (diff) | |
docker: fix systemd unit files (#120019)
* docker: fix systemd unit files Add missing docker.socket file and patch ExecStart in docker.service so these units are useful on non-nixos systems using systemd. (issue #70407) * moved systemd units under: optionalString (stdenv.isLinux)
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index f3d5572750fe5..954404e5268f8 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -105,6 +105,8 @@ rec { # systemd install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service + substituteInPlace $out/etc/systemd/system/docker.service --replace /usr/bin/dockerd $out/bin/dockerd + install -Dm644 ./contrib/init/systemd/docker.socket $out/etc/systemd/system/docker.socket ''; DOCKER_BUILDTAGS = [] @@ -178,6 +180,11 @@ rec { '' + optionalString (stdenv.isLinux) '' # symlink docker daemon to docker cli derivation ln -s ${moby}/bin/dockerd $out/bin/dockerd + + # systemd + mkdir -p $out/etc/systemd/system + ln -s ${moby}/etc/systemd/system/docker.service $out/etc/systemd/system/docker.service + ln -s ${moby}/etc/systemd/system/docker.socket $out/etc/systemd/system/docker.socket '' + '' # completion (cli) installShellCompletion --bash ./contrib/completion/bash/docker |