diff --git a/README.md b/README.md index fb4fb68..abbedcc 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Then create a file `vars.json` who contain : ```json { - "name": "myapp", + "container_name": "myapp", "repository": "https://git.example.com/vendor/app.git", "version": "master", "host": "myapp.example.com", diff --git a/playbooks/app-install.yml b/playbooks/app-install.yml index 89147ad..71bb355 100755 --- a/playbooks/app-install.yml +++ b/playbooks/app-install.yml @@ -7,15 +7,15 @@ - name: Clone repository git: repo: "{{ repository }}" - dest: "{{ working_dir }}/{{ name }}" + dest: "{{ working_dir }}/{{ container_name }}" version: "{{ version }}" - name: Build env file template: src: ../templates/.env.j2 - dest: '{{ working_dir }}/{{ name }}/.env.pilot' + dest: '{{ working_dir }}/{{ container_name }}/.env.pilot' - name: Build docker-compose file template: src: ../templates/docker-compose.yml.j2 - dest: '{{ working_dir }}/{{ name }}/docker-compose.pilot.yml' + dest: '{{ working_dir }}/{{ container_name }}/docker-compose.pilot.yml' diff --git a/playbooks/app-start.yml b/playbooks/app-start.yml index 5f1b7d9..31630a3 100644 --- a/playbooks/app-start.yml +++ b/playbooks/app-start.yml @@ -6,7 +6,7 @@ tasks: - name: Run container community.docker.docker_compose: - project_src: "{{ working_dir }}/{{ name }}" + project_src: "{{ working_dir }}/{{ container_name }}" build: yes files: - docker-compose.pilot.yml diff --git a/playbooks/app-stop.yml b/playbooks/app-stop.yml index 6283b22..8cb7fbe 100644 --- a/playbooks/app-stop.yml +++ b/playbooks/app-stop.yml @@ -6,7 +6,7 @@ tasks: - name: Run container community.docker.docker_compose: - project_src: "{{ working_dir }}/{{ name }}" + project_src: "{{ working_dir }}/{{ container_name }}" build: no files: - docker-compose.pilot.yml diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2 index a5cbb34..9f940ab 100644 --- a/templates/docker-compose.yml.j2 +++ b/templates/docker-compose.yml.j2 @@ -28,5 +28,5 @@ services: {% endif %} labels: - "traefik.enable=true" - - "traefik.http.routers.{{ name }}-http.rule=Host(`{{ host }}`)" - - "traefik.http.routers.{{ name }}-http.entrypoints=http" + - "traefik.http.routers.{{ container_name }}-http.rule=Host(`{{ host }}`)" + - "traefik.http.routers.{{ container_name }}-http.entrypoints=http"