From 0004113253dd8c71f6469810299372cd635b7fcc Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Wed, 10 Nov 2021 22:25:38 +0100 Subject: [PATCH] fix the docker role --- defaults/main.yml | 1 - docker-server.yml | 11 +++++++++++ requirements.yml | 7 +++++++ tasks/main.yml | 33 ++++++++++++++++++++------------- vars/main.yml | 2 +- 5 files changed, 39 insertions(+), 15 deletions(-) delete mode 100644 defaults/main.yml create mode 100644 docker-server.yml create mode 100644 requirements.yml diff --git a/defaults/main.yml b/defaults/main.yml deleted file mode 100644 index d07e7c1..0000000 --- a/defaults/main.yml +++ /dev/null @@ -1 +0,0 @@ -docker_skip_project: false diff --git a/docker-server.yml b/docker-server.yml new file mode 100644 index 0000000..ade39d1 --- /dev/null +++ b/docker-server.yml @@ -0,0 +1,11 @@ +--- +- hosts: docker + become: true + roles: + - common + - common-server + - restic + tasks: + - import_tasks: tasks/main.yml + vars_files: + - vars/main.yml diff --git a/requirements.yml b/requirements.yml new file mode 100644 index 0000000..5a498ce --- /dev/null +++ b/requirements.yml @@ -0,0 +1,7 @@ +roles: + - src: https://git.2li.ch/ansible/common.git + scm: git + - src: https://git.2li.ch/ansible/common-server.git + scm: git + - src: https://git.2li.ch/ansible/restic.git + scm: git diff --git a/tasks/main.yml b/tasks/main.yml index 5188598..d128dd9 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -32,19 +32,26 @@ - "LICENSE" - "README.md" -- name: "Copy the project files to the server" - copy: - src: "{{ docker_project_name }}" - dest: "{{ lookup('env', 'HOME') }}/" - become: false - when: not docker_skip_project +- name: "Get the Systems repository" + ansible.builtin.git: + repo: "https://git.2li.ch/Nebucatnetzer/docker_systems.git" + dest: "{{ lookup('env', 'HOME') }}/docker_systems" + become: no + when: docker_skip_project is undefined -- name: "Copy the traefik config" - copy: - src: "traefik.yaml" - dest: "{{ docker_project_path }}/traefik.yaml" - become: false - when: not docker_skip_project +- name: "Get the .env template" + ansible.builtin.fetch: + src: "{{ docker_project_path }}/.env.example" + dest: "/tmp/.env.example" + become: no + when: docker_skip_project is undefined + +- name: "Copy the .env file" + ansible.builtin.template: + src: "/tmp/.env.example" + dest: "{{ docker_project_path }}/.env" + become: no + when: docker_skip_project is undefined - name: "Start the Docker containers" community.docker.docker_compose: @@ -52,4 +59,4 @@ state: "present" pull: "yes" remove_orphans: "yes" - when: not docker_skip_project + when: docker_skip_project is undefined diff --git a/vars/main.yml b/vars/main.yml index 1fce86f..075fbe5 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,2 +1,2 @@ docker_lazydocker_version: 0.12 -docker_project_path: "{{ lookup('env', 'HOME') }}/{{ docker_project_name }}" +docker_project_path: "{{ lookup('env', 'HOME') }}/docker_systems/{{ docker_project_name }}"