Skip to content

Commit

Permalink
nix: Update nixpkgs to get updated docker-compose
Browse files Browse the repository at this point in the history
Without this docker-compose complains about depends_on config settings:

> ERROR: The Compose file './docker-compose.yml' is invalid because:
> services.tink-server.depends_on.generate-tls-certs.condition contains "service_completed_successfully", which is an invalid type, it should be a service_started, or a service_healthy
> services.web-assets-server.depends_on.fetch-and-convert-ubuntu-img.condition contains "service_completed_successfully", which is an invalid type, it should be a service_started, or a service_healthy
> services.registry.depends_on.generate-tls-certs.condition contains "service_completed_successfully", which is an invalid type, it should be a service_started, or a service_healthy

This was due to docker/compose#8154.

Signed-off-by: Manuel Mendez <github@i.m.mmlb.dev>
  • Loading branch information
mmlb committed Jun 2, 2022
1 parent 89333cf commit 69c8863
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ let _pkgs = import <nixpkgs> { };
in { pkgs ? import (_pkgs.fetchFromGitHub {
owner = "NixOS";
repo = "nixpkgs";
#branch@date: master@2021-03-18
rev = "800a3dd90970a277e3f6853633bd7faf04d6691e";
sha256 = "07gzvf3m3vh9kkig2x9iybv8yr04kvmrx665z0fb0n5h55ha4v8y";
#branch@date: master@2022-06-02
rev = "17e891b141ca8e599ebf6443d0870a67dd98f94f";
sha256 = "0qiyl04s4q0b3dhvyryz10hfdqhb2c7hk2lqn5llsb8lxsqj07l9";
}) { } }:

with pkgs;
Expand Down

0 comments on commit 69c8863

Please sign in to comment.