Skip to content

Commit

Permalink
#328 let's not use the Ansible docker-compose module due to RHEL9 con…
Browse files Browse the repository at this point in the history
…flicts
  • Loading branch information
Don Sizemore committed Dec 20, 2023
1 parent b5a1a24 commit ee267ca
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 43 deletions.
49 changes: 15 additions & 34 deletions tasks/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion tasks/localstack_create_bucket.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
17 changes: 9 additions & 8 deletions tasks/minio.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit ee267ca

Please sign in to comment.