JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nixos/tests/docker: wait for docker service (#109418)

Browse Source 
Previously the Docker daemon was started by systemd socket activation.
Thus, the Docker test waited for the sockets.target unit.
But when the docker module was changed to start the Docker daemon at
boot instead of by socket activation, the test was left untouched.
With the Docker 20.10 update this lead to a timing issue, where the
docker command is run before the Docker daemon has started and hangs.

Fixes #109416
This commit is contained in:
Milan 2021-01-15 03:38:15 +01:00 committed by GitHub
parent 4171cd53d6
commit f634c149e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/docker-tools.nix
View File

@ -18,7 +18,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
testScript = with pkgs.dockerTools; ''
unix_time_second1 = "1970-01-01T00:00:01Z"
docker.wait_for_unit("sockets.target")
docker.wait_for_unit("docker.service")
with subtest("Ensure Docker images use a stable date by default"):
docker.succeed(

2
nixos/tests/docker.nix
View File

@ -33,7 +33,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
testScript = ''
start_all()
docker.wait_for_unit("sockets.target")
docker.wait_for_unit("docker.service")
docker.succeed("tar cv --files-from /dev/null | docker import - scratchimg")
docker.succeed(
"docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"