From 94680d3ca35749e09d14477777db5cf7d376d6fa Mon Sep 17 00:00:00 2001 From: saibotk Date: Sat, 2 Jan 2021 01:43:45 +0100 Subject: [PATCH] docker / docker_compose: Update python library path to be more generic --- camo.yml | 2 +- codimd.yml | 2 +- docker-ipv6-nat.yml | 2 +- factorio.yml | 2 +- gitlab-runner.yml | 2 +- gitlab.yml | 2 +- keycloak.yml | 2 +- lvm-self-backup.yml | 2 +- mailcow.yml | 2 +- mastodon.yml | 2 +- matrix.yml | 2 +- minecraft-blockmap.yml | 2 +- minecraft.yml | 2 +- minio.yml | 2 +- monitoring.yml | 4 ++-- owncast.yml | 2 +- roles/docker/defaults/main.yml | 2 +- roles/docker_compose/defaults/main.yml | 2 +- static-websites.yml | 2 +- teamspeak.yml | 2 +- unicorns-website.yml | 2 +- 21 files changed, 22 insertions(+), 22 deletions(-) diff --git a/camo.yml b/camo.yml index 89884eb..7b24604 100644 --- a/camo.yml +++ b/camo.yml @@ -25,4 +25,4 @@ - traefik - camo environment: - PYTHONPATH: /opt/python2/ansible-dependencies/lib/python2.7/site-packages + PYTHONPATH: /opt/ansible-dependencies/lib/python2.7/site-packages diff --git a/codimd.yml b/codimd.yml index fd49e70..cbe0e5d 100644 --- a/codimd.yml +++ b/codimd.yml @@ -24,4 +24,4 @@ - traefik - codimd environment: - PYTHONPATH: /opt/python2/ansible-dependencies/lib/python2.7/site-packages + PYTHONPATH: /opt/ansible-dependencies/lib/python2.7/site-packages diff --git a/docker-ipv6-nat.yml b/docker-ipv6-nat.yml index 023a17a..f963de7 100644 --- a/docker-ipv6-nat.yml +++ b/docker-ipv6-nat.yml @@ -23,4 +23,4 @@ - docker_cleanup - docker_ipv6_nat environment: - PYTHONPATH: /opt/python2/ansible-dependencies/lib/python2.7/site-packages + PYTHONPATH: /opt/ansible-dependencies/lib/python2.7/site-packages diff --git a/factorio.yml b/factorio.yml index e93afdf..043a62f 100644 --- a/factorio.yml +++ b/factorio.yml @@ -23,4 +23,4 @@ - docker_cleanup - factorio environment: - PYTHONPATH: /opt/python2/ansible-dependencies/lib/python2.7/site-packages + PYTHONPATH: /opt/ansible-dependencies/lib/python2.7/site-packages diff --git a/gitlab-runner.yml b/gitlab-runner.yml index 6772f48..103a0c3 100644 --- a/gitlab-runner.yml +++ b/gitlab-runner.yml @@ -24,4 +24,4 @@ - docker_cleanup - gitlab_runner environment: - PYTHONPATH: /opt/python2/ansible-dependencies/lib/python2.7/site-packages + PYTHONPATH: /opt/ansible-dependencies/lib/python2.7/site-packages diff --git a/gitlab.yml b/gitlab.yml index 8725082..4542706 100644 --- a/gitlab.yml +++ b/gitlab.yml @@ -25,4 +25,4 @@ - traefik - gitlab environment: - PYTHONPATH: /opt/python2/ansible-dependencies/lib/python2.7/site-packages + PYTHONPATH: /opt/ansible-dependencies/lib/python2.7/site-packages diff --git a/keycloak.yml b/keycloak.yml index a1e116a..aa14357 100644 --- a/keycloak.yml +++ b/keycloak.yml @@ -25,4 +25,4 @@ - traefik - keycloak environment: - PYTHONPATH: /opt/python2/ansible-dependencies/lib/python2.7/site-packages + PYTHONPATH: /opt/ansible-dependencies/lib/python2.7/site-packages diff --git a/lvm-self-backup.yml b/lvm-self-backup.yml index 7e282f5..c59780f 100644 --- a/lvm-self-backup.yml +++ b/lvm-self-backup.yml @@ -21,4 +21,4 @@ - docker - lvm_self_backup environment: - PYTHONPATH: /opt/python2/ansible-dependencies/lib/python2.7/site-packages + PYTHONPATH: /opt/ansible-dependencies/lib/python2.7/site-packages diff --git a/mailcow.yml b/mailcow.yml index 506b7f2..4ec80b9 100644 --- a/mailcow.yml +++ b/mailcow.yml @@ -21,7 +21,7 @@ - docker - docker_compose environment: - PYTHONPATH: /opt/python2/ansible-dependencies/lib/python2.7/site-packages + PYTHONPATH: /opt/ansible-dependencies/lib/python2.7/site-packages # Manual steps: # Open ports / disable postfix diff --git a/mastodon.yml b/mastodon.yml index a83d75b..f5f863f 100644 --- a/mastodon.yml +++ b/mastodon.yml @@ -25,4 +25,4 @@ - traefik - mastodon environment: - PYTHONPATH: /opt/python2/ansible-dependencies/lib/python2.7/site-packages + PYTHONPATH: /opt/ansible-dependencies/lib/python2.7/site-packages diff --git a/matrix.yml b/matrix.yml index d662d21..366f0b8 100644 --- a/matrix.yml +++ b/matrix.yml @@ -24,4 +24,4 @@ - traefik - matrix environment: - PYTHONPATH: /opt/python2/ansible-dependencies/lib/python2.7/site-packages + PYTHONPATH: /opt/ansible-dependencies/lib/python2.7/site-packages diff --git a/minecraft-blockmap.yml b/minecraft-blockmap.yml index 314041e..b3c72f1 100644 --- a/minecraft-blockmap.yml +++ b/minecraft-blockmap.yml @@ -24,4 +24,4 @@ - traefik - minecraft_blockmap environment: - PYTHONPATH: /opt/python2/ansible-dependencies/lib/python2.7/site-packages + PYTHONPATH: /opt/ansible-dependencies/lib/python2.7/site-packages diff --git a/minecraft.yml b/minecraft.yml index 593337b..71560d3 100644 --- a/minecraft.yml +++ b/minecraft.yml @@ -24,4 +24,4 @@ - docker_cleanup - minecraft environment: - PYTHONPATH: /opt/python2/ansible-dependencies/lib/python2.7/site-packages + PYTHONPATH: /opt/ansible-dependencies/lib/python2.7/site-packages diff --git a/minio.yml b/minio.yml index 53f4b5d..7cae329 100644 --- a/minio.yml +++ b/minio.yml @@ -25,4 +25,4 @@ - traefik - minio environment: - PYTHONPATH: /opt/python2/ansible-dependencies/lib/python2.7/site-packages + PYTHONPATH: /opt/ansible-dependencies/lib/python2.7/site-packages diff --git a/monitoring.yml b/monitoring.yml index 949fabb..6c47f11 100644 --- a/monitoring.yml +++ b/monitoring.yml @@ -25,7 +25,7 @@ - traefik - monitoring environment: - PYTHONPATH: /opt/python2/ansible-dependencies/lib/python2.7/site-packages + PYTHONPATH: /opt/ansible-dependencies/lib/python2.7/site-packages - hosts: all serial: 1 @@ -35,4 +35,4 @@ - docker_cleanup - telegraf environment: - PYTHONPATH: /opt/python2/ansible-dependencies/lib/python2.7/site-packages + PYTHONPATH: /opt/ansible-dependencies/lib/python2.7/site-packages diff --git a/owncast.yml b/owncast.yml index 07edb56..bc4b1ca 100644 --- a/owncast.yml +++ b/owncast.yml @@ -24,4 +24,4 @@ - traefik - owncast environment: - PYTHONPATH: /opt/python2/ansible-dependencies/lib/python2.7/site-packages + PYTHONPATH: /opt/ansible-dependencies/lib/python2.7/site-packages diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index c903a63..e4ac363 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -40,7 +40,7 @@ docker_yum_gpg_key: https://download.docker.com/linux/centos/gpg # Should the python package for docker be installed via pip? docker_python_package_install: true # Where should it be installed? (Note: This will be installed as a standalone without breaking system dependencies) -docker_python_package_path: /opt/python2/ansible-dependencies +docker_python_package_path: /opt/ansible-dependencies # The name of the package to install pip via yum docker_python_pip_package: "python-pip" diff --git a/roles/docker_compose/defaults/main.yml b/roles/docker_compose/defaults/main.yml index ff24832..2c83f4f 100644 --- a/roles/docker_compose/defaults/main.yml +++ b/roles/docker_compose/defaults/main.yml @@ -30,7 +30,7 @@ docker_compose_wrapper_path: /usr/local/bin/docker-compose # 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/python2/ansible-dependencies +docker_compose_python_package_path: /opt/ansible-dependencies # The name of the package to install pip via the package manager docker_compose_python_pip_package: "python-pip" diff --git a/static-websites.yml b/static-websites.yml index 3643f42..7a05528 100644 --- a/static-websites.yml +++ b/static-websites.yml @@ -26,4 +26,4 @@ - traefik - static_websites environment: - PYTHONPATH: /opt/python2/ansible-dependencies/lib/python2.7/site-packages + PYTHONPATH: /opt/ansible-dependencies/lib/python2.7/site-packages diff --git a/teamspeak.yml b/teamspeak.yml index 7c6afca..fe359f4 100644 --- a/teamspeak.yml +++ b/teamspeak.yml @@ -25,4 +25,4 @@ - teamspeak - ts3audiobot environment: - PYTHONPATH: /opt/python2/ansible-dependencies/lib/python2.7/site-packages + PYTHONPATH: /opt/ansible-dependencies/lib/python2.7/site-packages diff --git a/unicorns-website.yml b/unicorns-website.yml index 39ef13a..14b8180 100644 --- a/unicorns-website.yml +++ b/unicorns-website.yml @@ -23,7 +23,7 @@ - docker_cleanup - traefik environment: - PYTHONPATH: /opt/python2/ansible-dependencies/lib/python2.7/site-packages + PYTHONPATH: /opt/ansible-dependencies/lib/python2.7/site-packages tasks: - name: Login to docker registry docker_login: