From 31bc0df6a2a7fe2a7cc965436411e75844aebbe0 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Mon, 14 Sep 2020 11:22:02 +0300 Subject: [PATCH] Specify memory limits as strings for docker compose Fixes the following error in Azure Pipelines CI after upgrade of Docker setup: [2020-09-14 06:50:07] The Compose file './docker-compose.yml' is invalid because: [2020-09-14 06:50:07] services.client.mem_limit contains an invalid type, it should be a string Fixes: https://pagure.io/freeipa/issue/8494 Signed-off-by: Alexander Bokovoy Reviewed-By: Stanislav Levin Reviewed-By: Christian Heimes --- ipatests/azure/Dockerfiles/docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ipatests/azure/Dockerfiles/docker-compose.yml b/ipatests/azure/Dockerfiles/docker-compose.yml index 8db097bfb..3bfd1a14c 100644 --- a/ipatests/azure/Dockerfiles/docker-compose.yml +++ b/ipatests/azure/Dockerfiles/docker-compose.yml @@ -8,7 +8,7 @@ services: security_opt: - apparmor:unconfined - seccomp:./seccomp.json - mem_limit: 1900m + mem_limit: "1900m" volumes: - /sys/fs/cgroup/systemd:/sys/fs/cgroup/systemd - ./ipa-test-config.yaml:/root/.ipa/ipa-test-config.yaml:ro @@ -25,7 +25,7 @@ services: security_opt: - apparmor:unconfined - seccomp:./seccomp.json - mem_limit: 1900m + mem_limit: "1900m" volumes: - /sys/fs/cgroup/systemd:/sys/fs/cgroup/systemd networks: @@ -39,7 +39,7 @@ services: security_opt: - apparmor:unconfined - seccomp:./seccomp.json - mem_limit: 536870912 + mem_limit: "536870912" volumes: - /sys/fs/cgroup/systemd:/sys/fs/cgroup/systemd # nfs server