From 85e1da3cbf733ff4239b422ca2de7e3928c269eb Mon Sep 17 00:00:00 2001
From: Sam Al-Sapti <sam@sapti.me>
Date: Wed, 4 Oct 2023 22:05:59 +0200
Subject: [PATCH] Last fixes + install Compose v2 plugin

---
 roles/docker/tasks/main.yml | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index e4d2b58f..0a42ea22 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -1,21 +1,31 @@
 # vim: ft=yaml.ansible
 ---
-- name: add docker gpg key
+- name: Add Docker PGP key
   apt_key:
     keyserver: pgp.mit.edu
     id: 8D81803C0EBFCD88
     state: present
 
-- name: add docker apt repository
+- name: Add Docker apt repository
   apt_repository:
     repo: deb https://download.docker.com/linux/ubuntu bionic stable
     state: present
     update_cache: yes
 
-- name: install docker-ce
+- name: Install Docker
   apt:
-    name: docker-ce
+    name: "{{ pkgs }}"
     state: present
+  vars:
+    pkgs:
+      - docker-ce
+      - docker-compose-plugin
+
+- name: Create docker-compose symlink
+  ansible.builtin.file:
+    name: /usr/local/bin/docker-compose
+    src: /usr/libexec/docker/cli-plugins/docker-compose
+    state: link
 
 - name: Configure cron job to prune unused Docker data weekly
   cron:
@@ -26,12 +36,15 @@
     user: root
     state: present
 
-- name: create folder structure for bind mounts
+- name: Create folder structure for bind mounts
   file:
-    name: "{{ volume_root_folder }}"
+    name: "{{ item }}"
     state: directory
+  loop:
+    - "{{ volume_root_folder }}"
+    - "{{ volume_website_folder }}"
 
-- name: setup services
+- name: Set up services
   import_tasks: services.yml
   tags:
     - setup_services