From 4528c5daf446027267cc71cded96155d8c939c24 Mon Sep 17 00:00:00 2001 From: William Date: Fri, 1 Jul 2022 21:08:54 +0200 Subject: [PATCH] =?UTF-8?q?D=C3=A9finition=20du=20Dockerfile=20utilis?= =?UTF-8?q?=C3=A9=20par=20l'app.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + docker-compose.yml.j2 | 3 ++- playbook.yml | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 314301b..b21f930 100644 --- a/README.md +++ b/README.md @@ -18,4 +18,5 @@ $ ansible-playbook -i hosts.ini playbook.yml \ -e repository=https://git.example.com/vendor/app.git \ -e version=master \ -e host=myapp.example.com + -e dockerfile=Dockerfile ``` diff --git a/docker-compose.yml.j2 b/docker-compose.yml.j2 index 9872cc0..30cf048 100644 --- a/docker-compose.yml.j2 +++ b/docker-compose.yml.j2 @@ -7,7 +7,8 @@ networks: services: app: build: - context: ./repository + context: ./ + dockerfile: {{ dockerfile }} networks: - web labels: diff --git a/playbook.yml b/playbook.yml index fc28e00..8b75e4b 100755 --- a/playbook.yml +++ b/playbook.yml @@ -7,10 +7,10 @@ - name: Clone repository git: repo: "{{ repository }}" - dest: "{{ working_dir }}/{{ name }}/repository" + dest: "{{ working_dir }}/{{ name }}" version: "{{ version }}" - name: Build docker-compose file template: src: docker-compose.yml.j2 - dest: '{{ working_dir }}/{{ name }}/docker-compose.yml' + dest: '{{ working_dir }}/{{ name }}/docker-compose.pilot.yml'