Merge pull request #109447 from mikroskeem/docker-20.10-fixes
Docker 20.10 fixes
commit95e1ba302d0927ca05566d39be9e27532c346ba8
authorRobert Hensing <roberth@users.noreply.github.com>
dateFri 15 Jan 2021, 15:25 (6 years ago)
parent17631db4000091
nixos/modules/virtualisation/docker.nix+2−2
@@ -165,7 +165,7 @@ in
165165 ''
166166 ${cfg.package}/bin/dockerd \
167167 --group=docker \
168− --host=unix:// \
168+ --host=fd:// \
169169 --log-driver=${cfg.logDriver} \
170170 ${optionalString (cfg.storageDriver != null) "--storage-driver=${cfg.storageDriver}"} \
171171 ${optionalString cfg.liveRestore "--live-restore" } \
@@ -216,7 +216,7 @@ in
216216 ]);
217217
218218 imports = [
219− (mkRemovedOptionModule ["virtualisation" "docker" "socketActivation"] "This option was removed in favor of starting docker at boot")
219+ (mkRemovedOptionModule ["virtualisation" "docker" "socketActivation"] "This option was removed and socket activation is now always active")
220220 ];
221221
222222}
nixos/tests/docker-tools.nix+1−1
@@ -18,7 +18,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
1818 testScript = with pkgs.dockerTools; ''
1919 unix_time_second1 = "1970-01-01T00:00:01Z"
2020
21− docker.wait_for_unit("docker.service")
21+ docker.wait_for_unit("sockets.target")
2222
2323 with subtest("Ensure Docker images use a stable date by default"):
2424 docker.succeed(
nixos/tests/docker.nix+1−1
@@ -33,7 +33,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
3333 testScript = ''
3434 start_all()
3535
36− docker.wait_for_unit("docker.service")
36+ docker.wait_for_unit("sockets.target")
3737 docker.succeed("tar cv --files-from /dev/null | docker import - scratchimg")
3838 docker.succeed(
3939 "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"