From 3866f6a0f2ba12d48bb0552637c3cc76f981e248 Mon Sep 17 00:00:00 2001 From: Nick Stokoe Date: Sun, 3 Jan 2021 15:54:00 +0000 Subject: [PATCH] roles/docker_compose_install/ -> roles/docker_compose --- roles/docker_compose/defaults/main.yml | 23 +++++++++++++++++++ roles/docker_compose/handlers/main.yml | 12 ++++++++++ .../tasks/main.yml | 4 ++-- .../docker_compose_install/defaults/main.yml | 16 ------------- 4 files changed, 37 insertions(+), 18 deletions(-) create mode 100644 roles/docker_compose/defaults/main.yml create mode 100644 roles/docker_compose/handlers/main.yml rename roles/{docker_compose_install => docker_compose}/tasks/main.yml (91%) delete mode 100644 roles/docker_compose_install/defaults/main.yml diff --git a/roles/docker_compose/defaults/main.yml b/roles/docker_compose/defaults/main.yml new file mode 100644 index 0000000..4a1a7b0 --- /dev/null +++ b/roles/docker_compose/defaults/main.yml @@ -0,0 +1,23 @@ +--- +## Installs docker-CE +# Following guide from here: +# https://docs.docker.com/install/linux/docker-ce/ubuntu/#set-up-the-repository + +# The docker apt repo key uri +docker_compose_apt_key_uri: https://download.docker.com/linux/ubuntu/gpg + +# The docker apt repo config line +docker_compose_apt_repo: deb https://download.docker.com/linux/ubuntu {{ansible_lsb.codename}} stable + +# Get this version from https://github.com/docker/compose/releases/ +# Check compatibility with docker. +# This needs to be supplied externally. +docker_compose_install_version: Change me! + +# Define where the docker project source directory is +# This needs to be supplied externally +docker_compose_base_dir: /opt/docker-compose + +# Where the docker-compose binary is put (assumed executable) +docker_compose_exe: /usr/local/bin/docker-compose + diff --git a/roles/docker_compose/handlers/main.yml b/roles/docker_compose/handlers/main.yml new file mode 100644 index 0000000..949e987 --- /dev/null +++ b/roles/docker_compose/handlers/main.yml @@ -0,0 +1,12 @@ +--- +- name: restart docker daemon + systemd: + name: docker + state: restarted + +- name: restart docker compose services + docker_compose: + restarted: yes + project_src: "{{ docker_compose_base_dir }}" + build: no + diff --git a/roles/docker_compose_install/tasks/main.yml b/roles/docker_compose/tasks/main.yml similarity index 91% rename from roles/docker_compose_install/tasks/main.yml rename to roles/docker_compose/tasks/main.yml index 64ec133..914dab0 100644 --- a/roles/docker_compose_install/tasks/main.yml +++ b/roles/docker_compose/tasks/main.yml @@ -14,12 +14,12 @@ - name: add docker repository key apt_key: - url: "{{ docker_compose_install_apt_key_uri }}" + url: "{{ docker_compose_apt_key_uri }}" state: present - name: add docker repository apt_repository: - repo: "{{ docker_compose_install_apt_repo }}" + repo: "{{ docker_compose_apt_repo }}" filename: docker-ce state: present update_cache: true diff --git a/roles/docker_compose_install/defaults/main.yml b/roles/docker_compose_install/defaults/main.yml deleted file mode 100644 index 06548fe..0000000 --- a/roles/docker_compose_install/defaults/main.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -## Installs docker-CE -# Following guide from here: -# https://docs.docker.com/install/linux/docker-ce/ubuntu/#set-up-the-repository - -# The docker apt repo key uri -docker_compose_install_apt_key_uri: https://download.docker.com/linux/ubuntu/gpg - -# The docker apt repo config line -docker_compose_install_apt_repo: deb https://download.docker.com/linux/ubuntu {{ansible_lsb.codename}} stable - -# This needs to be supplied externally. -# Get this version from https://github.com/docker/compose/releases/ -# Check compatibility with docker. -#docker_compose_install_compose_version: -