diff --git a/galaxy-requirements.yml b/galaxy-requirements.yml index 90e22f8..5522485 100644 --- a/galaxy-requirements.yml +++ b/galaxy-requirements.yml @@ -17,7 +17,7 @@ collections: - name: community.general version: 5.8.0 - name: community.docker - version: 2.7.1 + version: 3.4.0 - name: kubernetes.core version: 2.3.2 - name: community.mysql diff --git a/group_vars/all/plain.yml b/group_vars/all/plain.yml index 4dc7fc5..e5ce920 100644 --- a/group_vars/all/plain.yml +++ b/group_vars/all/plain.yml @@ -46,9 +46,10 @@ common_apt_dependencies: - python3-pip common_pip_dependencies: - - docker-compose - - requests>=2.28.1 + - requests>=2.28 - passlib + - pyOpenSSL>=23.0 + - docker-compose use_ssl: true http_s: "http{{ use_ssl | ternary('s', '', omit) }}" @@ -145,7 +146,6 @@ offsite_storage_server_ip: 142.132.155.83/32 docker_owner: "{{ admin_user }}" docker_group: "{{ admin_user }}" docker_users: "{{ smardigo_plattform_users }}" -docker_compose_version: "1.29.2" docker_compose_path: "/usr/bin/docker-compose" service_base_path: '/etc/smardigo' diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index b287053..4bd8a38 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -178,15 +178,6 @@ tags: - install -- name: "Download docker-compose bash completion" - ansible.builtin.get_url: - url: "https://raw.githubusercontent.com/docker/compose/{{ docker_compose_version }}/contrib/completion/bash/docker-compose" - dest: "/etc/bash_completion.d/docker-compose" - mode: '0644' - when: docker_enabled - tags: - - install - - name: "Ensure docker configuration directory exists" file: path: '/root/.docker/'