From 7469b6bbf46412b6b1c01dce45f279cfa33875e1 Mon Sep 17 00:00:00 2001 From: saibotk Date: Thu, 22 Feb 2024 01:29:19 +0100 Subject: [PATCH] !chore(docker-compose): Remove deprecated docker-compose python library Since docker_compose_v2 module is now finally available using the newer plugin, we can retire the hacky install of the docker compose python library. --- playbooks/camo.yml | 2 - playbooks/codimd.yml | 2 - playbooks/docker_ipv6_nat.yml | 2 - playbooks/factorio.yml | 2 - playbooks/gitlab.yml | 2 - playbooks/gitlab_runner.yml | 2 - playbooks/keycloak.yml | 2 - playbooks/mailcow.yml | 2 - playbooks/mastodon.yml | 2 - playbooks/matrix.yml | 2 - playbooks/matrix_delegate.yml | 2 - playbooks/matrix_elementweb.yml | 2 - playbooks/matrix_maubot.yml | 2 - playbooks/matrix_sliding_sync.yml | 1 - playbooks/matrix_webhooks.yml | 2 - playbooks/minecraft.yml | 2 - playbooks/minecraft_blockmap.yml | 2 - playbooks/minio.yml | 2 - playbooks/monitoring.yml | 3 - playbooks/owncast.yml | 2 - playbooks/penpot.yml | 2 - playbooks/ssh.yml | 2 - playbooks/static_websites.yml | 2 - playbooks/teamspeak.yml | 2 - playbooks/vikunja.yml | 2 - roles/camo/meta/main.yml | 1 - roles/codimd/meta/main.yml | 1 - roles/docker_compose/README.md | 27 -------- roles/docker_compose/defaults/main.yml | 42 ------------ roles/docker_compose/meta/main.yml | 21 ------ roles/docker_compose/tasks/Debian.yml | 32 ---------- roles/docker_compose/tasks/RedHat.yml | 32 ---------- roles/docker_compose/tasks/Rocky.yml | 32 ---------- roles/docker_compose/tasks/main.yml | 64 ------------------- .../templates/bin/docker-compose.j2 | 21 ------ roles/docker_ipv6_nat/meta/main.yml | 1 - roles/factorio/meta/main.yml | 1 - roles/gitlab/meta/main.yml | 1 - roles/gitlab_runner/meta/main.yml | 1 - roles/keycloak/meta/main.yml | 1 - roles/mastodon/meta/main.yml | 1 - roles/matrix/meta/main.yml | 1 - roles/matrix_delegate/meta/main.yml | 1 - roles/matrix_elementweb/meta/main.yml | 1 - roles/matrix_maubot/meta/main.yml | 1 - roles/matrix_sliding_sync/meta/main.yml | 1 - roles/matrix_webhooks/meta/main.yml | 1 - roles/minecraft/meta/main.yml | 1 - roles/minecraft_blockmap/meta/main.yml | 1 - roles/minio/meta/main.yml | 1 - roles/monitoring/meta/main.yml | 1 - roles/owncast/meta/main.yml | 1 - roles/penpot/meta/main.yml | 1 - roles/static_websites/meta/main.yml | 1 - roles/teamspeak/meta/main.yml | 1 - roles/telegraf/meta/main.yml | 1 - roles/traefik/meta/main.yml | 1 - roles/vikunja/meta/main.yml | 1 - 58 files changed, 346 deletions(-) delete mode 100644 roles/docker_compose/README.md delete mode 100644 roles/docker_compose/defaults/main.yml delete mode 100644 roles/docker_compose/meta/main.yml delete mode 100644 roles/docker_compose/tasks/Debian.yml delete mode 100644 roles/docker_compose/tasks/RedHat.yml delete mode 100644 roles/docker_compose/tasks/Rocky.yml delete mode 100644 roles/docker_compose/tasks/main.yml delete mode 100644 roles/docker_compose/templates/bin/docker-compose.j2 diff --git a/playbooks/camo.yml b/playbooks/camo.yml index d4bae81..dbc904d 100644 --- a/playbooks/camo.yml +++ b/playbooks/camo.yml @@ -1,5 +1,4 @@ --- - # Infrastructure # Ansible instructions to deploy the infrastructure # Copyright (C) 2019-2020 Christoph (Sheogorath) Kern @@ -21,7 +20,6 @@ hosts: camo roles: - docker - - docker_compose - docker_cleanup - traefik - camo diff --git a/playbooks/codimd.yml b/playbooks/codimd.yml index dede866..26210b5 100644 --- a/playbooks/codimd.yml +++ b/playbooks/codimd.yml @@ -1,5 +1,4 @@ --- - # Infrastructure # Ansible instructions to deploy the infrastructure # Copyright (C) 2020 Saibotk @@ -20,7 +19,6 @@ hosts: codimd roles: - docker - - docker_compose - docker_cleanup - traefik - codimd diff --git a/playbooks/docker_ipv6_nat.yml b/playbooks/docker_ipv6_nat.yml index bcd5e58..c92a22c 100644 --- a/playbooks/docker_ipv6_nat.yml +++ b/playbooks/docker_ipv6_nat.yml @@ -1,5 +1,4 @@ --- - # Infrastructure # Ansible instructions to deploy the infrastructure # Copyright (C) 2020 Saibotk @@ -20,7 +19,6 @@ hosts: docker_ipv6_nat roles: - docker - - docker_compose - docker_cleanup - docker_ipv6_nat environment: diff --git a/playbooks/factorio.yml b/playbooks/factorio.yml index 01a8c04..ac3350c 100644 --- a/playbooks/factorio.yml +++ b/playbooks/factorio.yml @@ -1,5 +1,4 @@ --- - # Infrastructure # Ansible instructions to deploy the infrastructure # Copyright (C) 2020 Saibotk @@ -20,7 +19,6 @@ hosts: factorio roles: - docker - - docker_compose - docker_cleanup - factorio environment: diff --git a/playbooks/gitlab.yml b/playbooks/gitlab.yml index a0270eb..1ae50d9 100644 --- a/playbooks/gitlab.yml +++ b/playbooks/gitlab.yml @@ -1,5 +1,4 @@ --- - # Infrastructure # Ansible instructions to deploy the infrastructure # Copyright (C) 2019-2020 Christoph (Sheogorath) Kern @@ -21,7 +20,6 @@ hosts: gitlab roles: - docker - - docker_compose - docker_cleanup - traefik - gitlab diff --git a/playbooks/gitlab_runner.yml b/playbooks/gitlab_runner.yml index ac54ec7..7fff330 100644 --- a/playbooks/gitlab_runner.yml +++ b/playbooks/gitlab_runner.yml @@ -1,5 +1,4 @@ --- - # Infrastructure # Ansible instructions to deploy the infrastructure # Copyright (C) 2019-2020 Christoph (Sheogorath) Kern @@ -21,7 +20,6 @@ hosts: gitlab_runner roles: - docker - - docker_compose - docker_cleanup - gitlab_runner environment: diff --git a/playbooks/keycloak.yml b/playbooks/keycloak.yml index 3586979..d5925d7 100644 --- a/playbooks/keycloak.yml +++ b/playbooks/keycloak.yml @@ -1,5 +1,4 @@ --- - # Infrastructure # Ansible instructions to deploy the infrastructure # Copyright (C) 2019-2020 Christoph (Sheogorath) Kern @@ -21,7 +20,6 @@ hosts: keycloak roles: - docker - - docker_compose - docker_cleanup - traefik - keycloak diff --git a/playbooks/mailcow.yml b/playbooks/mailcow.yml index b7f02a7..a00f49f 100644 --- a/playbooks/mailcow.yml +++ b/playbooks/mailcow.yml @@ -1,5 +1,4 @@ --- - # Infrastructure # Ansible instructions to deploy the infrastructure # Copyright (C) 2020 Saibotk @@ -20,7 +19,6 @@ hosts: mailcow roles: - docker - - docker_compose environment: PYTHONPATH: /opt/ansible-dependencies/lib/python{{ env_ansible_deps_python_version | default(2.7) }}/site-packages tasks: diff --git a/playbooks/mastodon.yml b/playbooks/mastodon.yml index 1d9e011..88c3157 100644 --- a/playbooks/mastodon.yml +++ b/playbooks/mastodon.yml @@ -1,5 +1,4 @@ --- - # Infrastructure # Ansible instructions to deploy the infrastructure # Copyright (C) 2019-2020 Christoph (Sheogorath) Kern @@ -21,7 +20,6 @@ hosts: mastodon roles: - docker - - docker_compose - docker_cleanup - traefik - mastodon diff --git a/playbooks/matrix.yml b/playbooks/matrix.yml index 2e011bd..795cb3e 100644 --- a/playbooks/matrix.yml +++ b/playbooks/matrix.yml @@ -1,5 +1,4 @@ --- - # Infrastructure # Ansible instructions to deploy the infrastructure # Copyright (C) 2020 Saibotk @@ -20,7 +19,6 @@ hosts: matrix roles: - docker - - docker_compose - docker_cleanup - traefik - matrix diff --git a/playbooks/matrix_delegate.yml b/playbooks/matrix_delegate.yml index 539ceed..44949bf 100644 --- a/playbooks/matrix_delegate.yml +++ b/playbooks/matrix_delegate.yml @@ -1,5 +1,4 @@ --- - # Infrastructure # Ansible instructions to deploy the infrastructure # Copyright (C) 2021 Saibotk @@ -20,7 +19,6 @@ hosts: matrix_delegate roles: - docker - - docker_compose - docker_cleanup - traefik - matrix_delegate diff --git a/playbooks/matrix_elementweb.yml b/playbooks/matrix_elementweb.yml index 5500235..c5957fd 100644 --- a/playbooks/matrix_elementweb.yml +++ b/playbooks/matrix_elementweb.yml @@ -1,5 +1,4 @@ --- - # Infrastructure # Ansible instructions to deploy the infrastructure # Copyright (C) 2021 Saibotk @@ -20,7 +19,6 @@ hosts: matrix_elementweb roles: - docker - - docker_compose - docker_cleanup - traefik - matrix_elementweb diff --git a/playbooks/matrix_maubot.yml b/playbooks/matrix_maubot.yml index 8e23de6..f5984dc 100644 --- a/playbooks/matrix_maubot.yml +++ b/playbooks/matrix_maubot.yml @@ -1,5 +1,4 @@ --- - # Infrastructure # Ansible instructions to deploy the infrastructure # Copyright (C) 2021 Saibotk @@ -20,7 +19,6 @@ hosts: matrix_maubot roles: - docker - - docker_compose - docker_cleanup - traefik - matrix_maubot diff --git a/playbooks/matrix_sliding_sync.yml b/playbooks/matrix_sliding_sync.yml index effdb7a..9890c2c 100644 --- a/playbooks/matrix_sliding_sync.yml +++ b/playbooks/matrix_sliding_sync.yml @@ -19,7 +19,6 @@ hosts: matrix_sliding_sync roles: - docker - - docker_compose - docker_cleanup - traefik - matrix_sliding_sync diff --git a/playbooks/matrix_webhooks.yml b/playbooks/matrix_webhooks.yml index 3f9cd8c..f44f012 100644 --- a/playbooks/matrix_webhooks.yml +++ b/playbooks/matrix_webhooks.yml @@ -1,5 +1,4 @@ --- - # Infrastructure # Ansible instructions to deploy the infrastructure # Copyright (C) 2021 Saibotk @@ -20,7 +19,6 @@ hosts: matrix_webhooks roles: - docker - - docker_compose - docker_cleanup - traefik - matrix_webhooks diff --git a/playbooks/minecraft.yml b/playbooks/minecraft.yml index 6e60aa8..67eaee6 100644 --- a/playbooks/minecraft.yml +++ b/playbooks/minecraft.yml @@ -1,5 +1,4 @@ --- - # Infrastructure # Ansible instructions to deploy the infrastructure # Copyright (C) 2019-2020 Christoph (Sheogorath) Kern @@ -21,7 +20,6 @@ hosts: minecraft roles: - docker - - docker_compose - docker_cleanup - minecraft environment: diff --git a/playbooks/minecraft_blockmap.yml b/playbooks/minecraft_blockmap.yml index 22484c0..2786db8 100644 --- a/playbooks/minecraft_blockmap.yml +++ b/playbooks/minecraft_blockmap.yml @@ -1,5 +1,4 @@ --- - # Infrastructure # Ansible instructions to deploy the infrastructure # Copyright (C) 2020 Saibotk @@ -20,7 +19,6 @@ hosts: minecraft roles: - docker - - docker_compose - docker_cleanup - traefik - minecraft_blockmap diff --git a/playbooks/minio.yml b/playbooks/minio.yml index ce41e8d..2201023 100644 --- a/playbooks/minio.yml +++ b/playbooks/minio.yml @@ -1,5 +1,4 @@ --- - # Infrastructure # Ansible instructions to deploy the infrastructure # Copyright (C) 2019-2020 Christoph (Sheogorath) Kern @@ -21,7 +20,6 @@ hosts: minio roles: - docker - - docker_compose - docker_cleanup - traefik - minio diff --git a/playbooks/monitoring.yml b/playbooks/monitoring.yml index f53cd7f..603b7da 100644 --- a/playbooks/monitoring.yml +++ b/playbooks/monitoring.yml @@ -1,5 +1,4 @@ --- - # Infrastructure # Ansible instructions to deploy the infrastructure # Copyright (C) 2019-2020 Christoph (Sheogorath) Kern @@ -21,7 +20,6 @@ hosts: monitoring roles: - docker - - docker_compose - docker_cleanup - traefik - monitoring @@ -33,7 +31,6 @@ serial: 1 roles: - docker - - docker_compose - docker_cleanup - telegraf environment: diff --git a/playbooks/owncast.yml b/playbooks/owncast.yml index f5241a9..c0946ba 100644 --- a/playbooks/owncast.yml +++ b/playbooks/owncast.yml @@ -1,5 +1,4 @@ --- - # Infrastructure # Ansible instructions to deploy the infrastructure # Copyright (C) 2020 Saibotk @@ -20,7 +19,6 @@ hosts: owncast roles: - docker - - docker_compose - docker_cleanup - traefik - owncast diff --git a/playbooks/penpot.yml b/playbooks/penpot.yml index ca29812..c3b83cc 100644 --- a/playbooks/penpot.yml +++ b/playbooks/penpot.yml @@ -1,5 +1,4 @@ --- - # Infrastructure # Ansible instructions to deploy the infrastructure # Copyright (C) 2021 Saibotk @@ -20,7 +19,6 @@ hosts: penpot roles: - docker - - docker_compose - docker_cleanup - traefik - penpot diff --git a/playbooks/ssh.yml b/playbooks/ssh.yml index 756b5bf..c17d888 100644 --- a/playbooks/ssh.yml +++ b/playbooks/ssh.yml @@ -1,5 +1,4 @@ --- - # Infrastructure # Ansible instructions to deploy the infrastructure # Copyright (C) 2019-2020 Christoph (Sheogorath) Kern @@ -23,5 +22,4 @@ - role: ssh - role: devsec.hardening.ssh_hardening become: true - - role: epel - role: fail2ban diff --git a/playbooks/static_websites.yml b/playbooks/static_websites.yml index 2e4ab93..6235b96 100644 --- a/playbooks/static_websites.yml +++ b/playbooks/static_websites.yml @@ -1,5 +1,4 @@ --- - # Infrastructure # Ansible instructions to deploy the infrastructure # Copyright (C) 2019-2020 Christoph (Sheogorath) Kern @@ -22,7 +21,6 @@ serial: 1 roles: - docker - - docker_compose - docker_cleanup - traefik - static_websites diff --git a/playbooks/teamspeak.yml b/playbooks/teamspeak.yml index 5830df4..e8edc64 100644 --- a/playbooks/teamspeak.yml +++ b/playbooks/teamspeak.yml @@ -1,5 +1,4 @@ --- - # Infrastructure # Ansible instructions to deploy the infrastructure # Copyright (C) 2020 Saibotk @@ -20,7 +19,6 @@ hosts: teamspeak roles: - docker - - docker_compose - docker_cleanup - traefik - teamspeak diff --git a/playbooks/vikunja.yml b/playbooks/vikunja.yml index 3f8ea18..3ce7636 100644 --- a/playbooks/vikunja.yml +++ b/playbooks/vikunja.yml @@ -1,5 +1,4 @@ --- - # Infrastructure # Ansible instructions to deploy the infrastructure # Copyright (C) 2021 Saibotk @@ -20,7 +19,6 @@ hosts: vikunja roles: - docker - - docker_compose - docker_cleanup - traefik - vikunja diff --git a/roles/camo/meta/main.yml b/roles/camo/meta/main.yml index 90e0cd8..8b2296a 100644 --- a/roles/camo/meta/main.yml +++ b/roles/camo/meta/main.yml @@ -41,5 +41,4 @@ galaxy_info: dependencies: - role: docker - - role: docker_compose - role: traefik diff --git a/roles/codimd/meta/main.yml b/roles/codimd/meta/main.yml index 826292b..f284298 100644 --- a/roles/codimd/meta/main.yml +++ b/roles/codimd/meta/main.yml @@ -41,5 +41,4 @@ galaxy_info: dependencies: - role: docker - - role: docker_compose - role: traefik diff --git a/roles/docker_compose/README.md b/roles/docker_compose/README.md deleted file mode 100644 index e6b76df..0000000 --- a/roles/docker_compose/README.md +++ /dev/null @@ -1,27 +0,0 @@ -docker_compose -========= - -This will install the [docker-compose](https://docs.docker.com/compose/) python library via pip and by default choose another install location, -to prevent breaking system-wide pip packages. - -Requirements ------------- - -You will need to have the EPEL repository enabled (eg. by installing the `epel-release` package), if you want to install `docker-compose` via yum. - -Role Variables --------------- - -**Please look at the [defaults/main.yml](defaults/main.yml) for all available variables and their description.** - -**Note: Lines that are commented out via `#` are usually still valid/used variables, but they are not defined by default, so they might enable a feature, when uncommenting/defining them!** - -Dependencies ------------- - -- epel (optional/situational) - -License -------- - -GPL-3.0-only diff --git a/roles/docker_compose/defaults/main.yml b/roles/docker_compose/defaults/main.yml deleted file mode 100644 index 74f1732..0000000 --- a/roles/docker_compose/defaults/main.yml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# Default variables for the docker_compose role - -# Infrastructure -# Ansible instructions to deploy the infrastructure -# Copyright (C) 2020 Saibotk -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# Control if the docker-compose package should be removed (default) -docker_compose_package: "docker-compose" -docker_compose_package_state: "absent" - -# Should a docker-compose wrapper script be deployed? -# This will ensure, that you can still use the `docker-compose` command as usual. -docker_compose_install_wrapper: true -docker_compose_wrapper_path: /usr/local/bin/docker-compose - -# Should docker-compose be installed via pip to another target? -# This is used to prevent docker-compose from corrupting other system-wide installed pip packages and thus -# the package will be installed standalone in another directory as defined below. -docker_compose_python_package_install: true -docker_compose_python_package_path: /opt/ansible-dependencies - -# The package states of needed packages to install for the python libraries -docker_compose_python_pip_package_state: "present" -docker_compose_python_virtualenv_package_state: "present" - -# The pip package name of for `docker-compose` -docker_compose_pip_package: "docker-compose" -docker_compose_pip_package_state: "present" -docker_compose_pip_package_version: "1.24.1" diff --git a/roles/docker_compose/meta/main.yml b/roles/docker_compose/meta/main.yml deleted file mode 100644 index 3dac3dd..0000000 --- a/roles/docker_compose/meta/main.yml +++ /dev/null @@ -1,21 +0,0 @@ -galaxy_info: - author: saibotk - description: "Installs the docker-compose pip package." - license: GPL-3.0-only - min_ansible_version: "2.9" - standalone: true - - platforms: - - name: EL - versions: - - "7" - - name: Ubuntu - versions: - - all - - name: Debian - versions: - - all - - galaxy_tags: [] - -dependencies: [] diff --git a/roles/docker_compose/tasks/Debian.yml b/roles/docker_compose/tasks/Debian.yml deleted file mode 100644 index 02740e3..0000000 --- a/roles/docker_compose/tasks/Debian.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- -# Tasks file for the docker_compose role - -# Infrastructure -# Ansible instructions to deploy the infrastructure -# -# Copyright (C) 2020 Saibotk -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -- name: Ensure pip & virtualenv are installed. - ansible.builtin.package: - name: "{{ item.name }}" - state: "{{ item.state }}" - loop: - - name: "python3-pip" - state: "{{ docker_compose_python_pip_package_state }}" - - name: "python3-virtualenv" - state: "{{ docker_compose_python_virtualenv_package_state }}" - when: - - docker_compose_python_package_install - become: true diff --git a/roles/docker_compose/tasks/RedHat.yml b/roles/docker_compose/tasks/RedHat.yml deleted file mode 100644 index b65b2db..0000000 --- a/roles/docker_compose/tasks/RedHat.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- -# Tasks file for the docker_compose role - -# Infrastructure -# Ansible instructions to deploy the infrastructure -# -# Copyright (C) 2020 Saibotk -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -- name: Ensure pip & virtualenv are installed. - ansible.builtin.package: - name: "{{ item.name }}" - state: "{{ item.state }}" - loop: - - name: "python-pip" - state: "{{ docker_compose_python_pip_package_state }}" - - name: "python-virtualenv" - state: "{{ docker_compose_python_virtualenv_package_state }}" - when: - - docker_compose_python_package_install - become: true diff --git a/roles/docker_compose/tasks/Rocky.yml b/roles/docker_compose/tasks/Rocky.yml deleted file mode 100644 index 57bb598..0000000 --- a/roles/docker_compose/tasks/Rocky.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- -# Tasks file for the docker_compose role - -# Infrastructure -# Ansible instructions to deploy the infrastructure -# -# Copyright (C) 2021 Saibotk -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -- name: Ensure pip & virtualenv are installed. - ansible.builtin.package: - name: "{{ item.name }}" - state: "{{ item.state }}" - loop: - - name: "python3-pip" - state: "{{ docker_compose_python_pip_package_state }}" - - name: "python3-virtualenv" - state: "{{ docker_compose_python_virtualenv_package_state }}" - when: - - docker_compose_python_package_install - become: true diff --git a/roles/docker_compose/tasks/main.yml b/roles/docker_compose/tasks/main.yml deleted file mode 100644 index 410d6e6..0000000 --- a/roles/docker_compose/tasks/main.yml +++ /dev/null @@ -1,64 +0,0 @@ ---- -# Tasks file for the docker-compose role - -# Infrastructure -# Ansible instructions to deploy the infrastructure -# Copyright (C) 2020 Saibotk -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -- name: Ensure package install state - ansible.builtin.package: - name: "{{ docker_compose_package }}" - state: "{{ docker_compose_package_state }}" - become: true - -- name: "Select tasks for {{ ansible_distribution }} {{ ansible_distribution_major_version }}" # noqa name[template] - ansible.builtin.include_tasks: "{{ distro_file }}" - with_first_found: - - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml" - - "{{ ansible_distribution }}.yml" - - "{{ ansible_os_family }}.yml" - loop_control: - loop_var: distro_file - -- name: Install docker-compose python package. - ansible.builtin.pip: - name: "{{ docker_compose_pip_package }}" - state: "{{ docker_compose_pip_package_state }}" - virtualenv: "{{ docker_compose_python_package_path }}" - virtualenv_python: "python{{ ansible_python_version | regex_search('\\d+\\.\\d+') }}" - version: "{{ docker_compose_pip_package_version | default(omit) }}" - become: true - changed_when: false - when: docker_compose_python_package_install - -- name: Deploy docker-compose wrapper - ansible.builtin.template: - src: bin/docker-compose.j2 - dest: "{{ docker_compose_wrapper_path }}" - owner: 'root' - group: 'root' - mode: '0755' - become: true - when: - - docker_compose_install_wrapper - -- name: Create symlink in /usr/bin for wrapper - ansible.builtin.file: - src: "{{ docker_compose_wrapper_path }}" - dest: "/usr/bin/docker-compose" - state: link - become: true - when: - - docker_compose_install_wrapper diff --git a/roles/docker_compose/templates/bin/docker-compose.j2 b/roles/docker_compose/templates/bin/docker-compose.j2 deleted file mode 100644 index cc9cc57..0000000 --- a/roles/docker_compose/templates/bin/docker-compose.j2 +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -# Infrastructure -# Ansible instructions to deploy the infrastructure -# Copyright (C) 2020 Saibotk -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -set -eo pipefail - -exec {{ docker_compose_python_package_path }}/bin/docker-compose "$@" diff --git a/roles/docker_ipv6_nat/meta/main.yml b/roles/docker_ipv6_nat/meta/main.yml index 7aa58fb..f035282 100644 --- a/roles/docker_ipv6_nat/meta/main.yml +++ b/roles/docker_ipv6_nat/meta/main.yml @@ -41,4 +41,3 @@ galaxy_info: dependencies: - role: docker - - role: docker_compose diff --git a/roles/factorio/meta/main.yml b/roles/factorio/meta/main.yml index 7ad687a..1c2ba93 100644 --- a/roles/factorio/meta/main.yml +++ b/roles/factorio/meta/main.yml @@ -41,4 +41,3 @@ galaxy_info: dependencies: - role: docker - - role: docker_compose diff --git a/roles/gitlab/meta/main.yml b/roles/gitlab/meta/main.yml index 8c91e09..32229a2 100644 --- a/roles/gitlab/meta/main.yml +++ b/roles/gitlab/meta/main.yml @@ -41,5 +41,4 @@ galaxy_info: dependencies: - role: docker - - role: docker_compose - role: traefik diff --git a/roles/gitlab_runner/meta/main.yml b/roles/gitlab_runner/meta/main.yml index 75a35d3..d13869d 100644 --- a/roles/gitlab_runner/meta/main.yml +++ b/roles/gitlab_runner/meta/main.yml @@ -41,4 +41,3 @@ galaxy_info: dependencies: - role: docker - - role: docker_compose diff --git a/roles/keycloak/meta/main.yml b/roles/keycloak/meta/main.yml index 2e8cf42..7839933 100644 --- a/roles/keycloak/meta/main.yml +++ b/roles/keycloak/meta/main.yml @@ -41,5 +41,4 @@ galaxy_info: dependencies: - role: docker - - role: docker_compose - role: traefik diff --git a/roles/mastodon/meta/main.yml b/roles/mastodon/meta/main.yml index fc28898..8dd1ae8 100644 --- a/roles/mastodon/meta/main.yml +++ b/roles/mastodon/meta/main.yml @@ -41,5 +41,4 @@ galaxy_info: dependencies: - role: docker - - role: docker_compose - role: traefik diff --git a/roles/matrix/meta/main.yml b/roles/matrix/meta/main.yml index 9f58f67..1288fe3 100644 --- a/roles/matrix/meta/main.yml +++ b/roles/matrix/meta/main.yml @@ -41,5 +41,4 @@ galaxy_info: dependencies: - role: docker - - role: docker_compose - role: traefik diff --git a/roles/matrix_delegate/meta/main.yml b/roles/matrix_delegate/meta/main.yml index 38ec852..03e9e3d 100644 --- a/roles/matrix_delegate/meta/main.yml +++ b/roles/matrix_delegate/meta/main.yml @@ -41,5 +41,4 @@ galaxy_info: dependencies: - role: docker - - role: docker_compose - role: traefik diff --git a/roles/matrix_elementweb/meta/main.yml b/roles/matrix_elementweb/meta/main.yml index 6ef7345..3ac25f4 100644 --- a/roles/matrix_elementweb/meta/main.yml +++ b/roles/matrix_elementweb/meta/main.yml @@ -41,5 +41,4 @@ galaxy_info: dependencies: - role: docker - - role: docker_compose - role: traefik diff --git a/roles/matrix_maubot/meta/main.yml b/roles/matrix_maubot/meta/main.yml index 22d94a7..1501913 100644 --- a/roles/matrix_maubot/meta/main.yml +++ b/roles/matrix_maubot/meta/main.yml @@ -41,5 +41,4 @@ galaxy_info: dependencies: - role: docker - - role: docker_compose - role: traefik diff --git a/roles/matrix_sliding_sync/meta/main.yml b/roles/matrix_sliding_sync/meta/main.yml index 648ba0e..1f61d91 100644 --- a/roles/matrix_sliding_sync/meta/main.yml +++ b/roles/matrix_sliding_sync/meta/main.yml @@ -41,5 +41,4 @@ galaxy_info: dependencies: - role: docker - - role: docker_compose - role: traefik diff --git a/roles/matrix_webhooks/meta/main.yml b/roles/matrix_webhooks/meta/main.yml index 53eaec6..8d77833 100644 --- a/roles/matrix_webhooks/meta/main.yml +++ b/roles/matrix_webhooks/meta/main.yml @@ -41,5 +41,4 @@ galaxy_info: dependencies: - role: docker - - role: docker_compose - role: traefik diff --git a/roles/minecraft/meta/main.yml b/roles/minecraft/meta/main.yml index 1f06b24..51da572 100644 --- a/roles/minecraft/meta/main.yml +++ b/roles/minecraft/meta/main.yml @@ -41,4 +41,3 @@ galaxy_info: dependencies: - role: docker - - role: docker_compose diff --git a/roles/minecraft_blockmap/meta/main.yml b/roles/minecraft_blockmap/meta/main.yml index 28d0d27..13bb8a9 100644 --- a/roles/minecraft_blockmap/meta/main.yml +++ b/roles/minecraft_blockmap/meta/main.yml @@ -41,5 +41,4 @@ galaxy_info: dependencies: - role: docker - - role: docker_compose - role: traefik diff --git a/roles/minio/meta/main.yml b/roles/minio/meta/main.yml index 0ae35cf..b721599 100644 --- a/roles/minio/meta/main.yml +++ b/roles/minio/meta/main.yml @@ -41,5 +41,4 @@ galaxy_info: dependencies: - role: docker - - role: docker_compose - role: traefik diff --git a/roles/monitoring/meta/main.yml b/roles/monitoring/meta/main.yml index 52fcb1d..8d8de48 100644 --- a/roles/monitoring/meta/main.yml +++ b/roles/monitoring/meta/main.yml @@ -41,5 +41,4 @@ galaxy_info: dependencies: - role: docker - - role: docker_compose - role: traefik diff --git a/roles/owncast/meta/main.yml b/roles/owncast/meta/main.yml index 616deb1..3b06e6d 100644 --- a/roles/owncast/meta/main.yml +++ b/roles/owncast/meta/main.yml @@ -41,5 +41,4 @@ galaxy_info: dependencies: - role: docker - - role: docker_compose - role: traefik diff --git a/roles/penpot/meta/main.yml b/roles/penpot/meta/main.yml index 4a66cd8..4cbd8f6 100644 --- a/roles/penpot/meta/main.yml +++ b/roles/penpot/meta/main.yml @@ -41,5 +41,4 @@ galaxy_info: dependencies: - role: docker - - role: docker_compose - role: traefik diff --git a/roles/static_websites/meta/main.yml b/roles/static_websites/meta/main.yml index 465b8b6..4714ff8 100644 --- a/roles/static_websites/meta/main.yml +++ b/roles/static_websites/meta/main.yml @@ -41,5 +41,4 @@ galaxy_info: dependencies: - role: docker - - role: docker_compose - role: traefik diff --git a/roles/teamspeak/meta/main.yml b/roles/teamspeak/meta/main.yml index ea7f08e..e9647b9 100644 --- a/roles/teamspeak/meta/main.yml +++ b/roles/teamspeak/meta/main.yml @@ -41,4 +41,3 @@ galaxy_info: dependencies: - role: docker - - role: docker_compose diff --git a/roles/telegraf/meta/main.yml b/roles/telegraf/meta/main.yml index b33e9b9..ca28d16 100644 --- a/roles/telegraf/meta/main.yml +++ b/roles/telegraf/meta/main.yml @@ -41,4 +41,3 @@ galaxy_info: dependencies: - role: docker - - role: docker_compose diff --git a/roles/traefik/meta/main.yml b/roles/traefik/meta/main.yml index 209f692..ad81e06 100644 --- a/roles/traefik/meta/main.yml +++ b/roles/traefik/meta/main.yml @@ -41,4 +41,3 @@ galaxy_info: dependencies: - role: docker - - role: docker_compose diff --git a/roles/vikunja/meta/main.yml b/roles/vikunja/meta/main.yml index da9a5ce..0c47248 100644 --- a/roles/vikunja/meta/main.yml +++ b/roles/vikunja/meta/main.yml @@ -41,5 +41,4 @@ galaxy_info: dependencies: - role: docker - - role: docker_compose - role: traefik