From dbe7339134ed72831ca73f6398e3c8e58baab526 Mon Sep 17 00:00:00 2001 From: Ivo Jimenez Date: Tue, 21 Feb 2017 23:07:33 -0800 Subject: [PATCH] Hack to deal with ansible/jinja2 issues Deals with https://github.com/ansible/ansible/issues/17992 --- tasks/run-compose.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tasks/run-compose.yml b/tasks/run-compose.yml index 44a4ab3..d51c43c 100644 --- a/tasks/run-compose.yml +++ b/tasks/run-compose.yml @@ -4,15 +4,14 @@ - name: write compose file copy: - content: "{{ bench.compose | to_nice_yaml }}" + content: '{{ bench.compose | to_yaml | regex_replace("cpu_quota: ''([0-9]+)''", "cpu_quota: \1") }}' dest: "/tmp/docker-compose.yml" - name: run compose shell: > docker run --rm --name=compose \ - --volume /tmp/docker-compose.yml:/docker-compose.yml \ --volume `which docker`:/usr/bin/docker \ --volume /var/run/docker.sock:/var/run/docker.sock \ - --volume /usr/lib/x86_64-linux-gnu/libltdl.so.7:/usr/lib/x86_64-linux-gnu/libltdl.so.7 \ + --volume /tmp/docker-compose.yml:/docker-compose.yml \ docker/compose:1.11.1 up \ --force-recreate --abort-on-container-exit