From ee267cab646c65ef50eb60178786eba492df069f Mon Sep 17 00:00:00 2001
From: Don Sizemore <don.sizemore@github.com>
Date: Wed, 20 Dec 2023 09:38:42 -0500
Subject: [PATCH] #328 let's not use the Ansible docker-compose module due to
 RHEL9 conflicts

---
 tasks/docker.yml                   | 49 +++++++++---------------------
 tasks/localstack_create_bucket.yml |  1 -
 tasks/minio.yml                    | 17 ++++++-----
 3 files changed, 24 insertions(+), 43 deletions(-)

diff --git a/tasks/docker.yml b/tasks/docker.yml
index cbe4c79..93d7d40 100644
--- a/tasks/docker.yml
+++ b/tasks/docker.yml
@@ -11,20 +11,21 @@
     name: ['docker-ce', 'docker-compose-plugin']
     state: latest
 
-- name: Ansible docker module requires python-docker
-  ansible.builtin.package:
-    name: 'python3-docker'
-    state: latest
-
-- name: pip must update itself
-  ansible.builtin.pip:
-    name: pip
-    executable: pip3
-    state: latest
-
-- name: and docker-compose python package
-  ansible.builtin.pip:
-    name: docker-compose
+# this breaks on RHEL9. let's use 'docker compose' instead
+#- name: Ansible docker module requires python-docker
+#  ansible.builtin.package:
+#    name: 'python3-docker'
+#    state: latest
+#
+#- name: pip must update itself
+#  ansible.builtin.pip:
+#    name: pip
+#    executable: pip3
+#    state: latest
+#
+#- name: and docker-compose python package
+#  ansible.builtin.pip:
+#    name: docker-compose
 
 - name: ensure /etc/docker exists
   ansible.builtin.file:
@@ -43,26 +44,6 @@
     mode: 0644
   when: docker.cidr is undefined
 
-- name: infer become_user
-  ansible.builtin.command: whoami
-  register: whoami_output
-
-- name: register docker_user
-  ansible.builtin.set_fact:
-    docker_user: "{{ whoami_output.stdout }}"
-
-- name: add ansible_ssh_user to docker group
-  ansible.builtin.user:
-    name: '{{ docker_user }}'
-    groups: docker
-    append: yes
-
-- name: add dataverse user to docker group
-  ansible.builtin.user:
-    name: '{{ dataverse.payara.user }}'
-    groups: docker
-    append: yes
-
 - name: reload systemd, enable docker, start
   ansible.builtin.systemd:
     name: docker
diff --git a/tasks/localstack_create_bucket.yml b/tasks/localstack_create_bucket.yml
index 7e98bcc..743d7d5 100644
--- a/tasks/localstack_create_bucket.yml
+++ b/tasks/localstack_create_bucket.yml
@@ -8,7 +8,6 @@
   ansible.builtin.shell: "aws --endpoint={{ custom_endpoint_escaped }} s3 mb s3://{{ bucket_options.bucket_name }}"
   become: yes
   become_user: "{{ localstack.user }}"
-  when: bucket_options.custom_endpoint_url | length > 0
 
 - name: place CORS.json
   ansible.builtin.copy:
diff --git a/tasks/minio.yml b/tasks/minio.yml
index df34423..53d33a7 100644
--- a/tasks/minio.yml
+++ b/tasks/minio.yml
@@ -69,21 +69,22 @@
       register: compose_file
 
     - name: STORAGE | Stop `docker-compose down` MinIO
-      community.docker.docker_compose:
-        project_src: "{{ minio.docker.project_location }}"
-        state: absent
-        remove_orphans: true
+      ansible.builtin.shell: 'docker compose -f minio_compose.yml down'
       become: true
+      become_user: '{{ minio.user }}'
+      args:
+        chdir: '~{{ minio.user }}'
       register: continer_stop
       when:
         - minio_container.exists
         - copy_compose.changed
 
     - name: STORAGE | Run `docker-compose up` MinIO
-      community.docker.docker_compose:
-        project_src: "{{ minio.docker.project_location }}"
-        build: true
-        files: minio_compose.yml
+      ansible.builtin.shell: 'docker compose -f minio_compose.yml up -d'
+      become: true
+      become_user: '{{ minio.user }}'
+      args:
+        chdir: '~{{ minio.user }}'
       when: (not minio_container.exists and minio_dir.stat.isdir and compose_file.stat.exists) or continer_stop.changed
 
 - ansible.builtin.import_tasks: minio_jvm_options.yml