Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix deprecation warnings #72

Merged
merged 6 commits into from
May 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/run-playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,4 @@ jobs:
- name: Check containers
run: |
sleep 60
python3 -m venv .venv
source .venv/bin/activate
pip3 install -r "@.github/workflows/scripts/requirements.txt"
sudo make verify-containers
7 changes: 0 additions & 7 deletions .github/workflows/scripts/requirements.txt

This file was deleted.

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ install-reqs:
@ansible-galaxy install -r galaxy-requirements.yml -p ./galaxy-roles

verify-containers:
@sudo .venv/bin/python3 .github/workflows/scripts/check_containers.py
@sudo python3 .github/workflows/scripts/check_containers.py

help:
@echo make basic :: setup a basic config
Expand Down
1 change: 0 additions & 1 deletion hms-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
replace: '_'
pip_install_packages:
- name: docker
version: "6.1.3"
- name: docker-compose

roles:
Expand Down
16 changes: 7 additions & 9 deletions roles/hmsdocker/files/scripts/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
certifi==2023.11.17
certifi==2024.2.2
cffi==1.16.0
charset-normalizer==3.3.2
cryptography==42.0.4
docker==6.1.3
cryptography==42.0.7
docker==7.1.0
idna==3.7
packaging==23.2
pycparser==2.21
python-dotenv==1.0.0
requests==2.31.0
urllib3==2.1.0
websocket-client==1.7.0
pycparser==2.22
python-dotenv==1.0.1
requests==2.32.2
urllib3==2.2.1
xmltodict==0.13.0
4 changes: 2 additions & 2 deletions roles/hmsdocker/tasks/authentik.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
register: authentik_key_template_output
no_log: true
vars:
- key: "{{ authentik_old_key if authentik_old_key is defined and authentik_old_key != '' else lookup('password', '/dev/null length=50 chars=ascii_letters') }}"
key: "{{ authentik_old_key if authentik_old_key is defined and authentik_old_key != '' else lookup('password', '/dev/null length=50 chars=ascii_letters') }}"

- name: Ensure authentik postgres password file
ansible.builtin.template:
Expand All @@ -59,7 +59,7 @@
register: authentik_pgpass_template_output
no_log: true
vars:
- key: "{{ authentik_old_pg_pass if authentik_old_pg_pass is defined and authentik_old_pg_pass != '' else lookup('password', '/dev/null length=50 chars=ascii_letters') }}"
key: "{{ authentik_old_pg_pass if authentik_old_pg_pass is defined and authentik_old_pg_pass != '' else lookup('password', '/dev/null length=50 chars=ascii_letters') }}"

- name: Slurp authentik secret key data
ansible.builtin.slurp:
Expand Down
2 changes: 1 addition & 1 deletion roles/hmsdocker/tasks/homepage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
no_log: true
register: watchtower_key_output
vars:
- key: "{{ lookup('password', '/dev/null length=32 chars=ascii_letters') }}"
key: "{{ lookup('password', '/dev/null length=32 chars=ascii_letters') }}"

- name: Slurp Watchtower key data
ansible.builtin.slurp:
Expand Down
10 changes: 5 additions & 5 deletions roles/hmsdocker/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@
no_log: true
register: compose_env
vars:
- authentik_key: "{{ (slurped_key_data['content'] | b64decode) if slurped_key_data['content'] is defined else '### Will be obtained during full run ###' }}"
- authentik_pgpass: "{{ (slurped_pg_pass_data['content'] | b64decode) if slurped_pg_pass_data['content'] is defined else '### Will be obtained during full run ###' }}"
- authentik_pgu: "{{ authentik_old_pg_user if authentik_old_pg_user is defined and authentik_old_pg_user != '' else authentik_pg_user }}"
- authentik_pgdb: "{{ authentik_old_pg_db if authentik_old_pg_db is defined and authentik_old_pg_db != '' else authentik_pg_db }}"
- watchtower_key: "{{ (slurped_watchtower_key_data['content'] | b64decode) if slurped_watchtower_key_data['content'] is defined else '### Will be obtained during full run ###' }}"
authentik_key: "{{ (slurped_key_data['content'] | b64decode) if slurped_key_data['content'] is defined else '### Will be obtained during full run ###' }}"
authentik_pgpass: "{{ (slurped_pg_pass_data['content'] | b64decode) if slurped_pg_pass_data['content'] is defined else '### Will be obtained during full run ###' }}"
authentik_pgu: "{{ authentik_old_pg_user if authentik_old_pg_user is defined and authentik_old_pg_user != '' else authentik_pg_user }}"
authentik_pgdb: "{{ authentik_old_pg_db if authentik_old_pg_db is defined and authentik_old_pg_db != '' else authentik_pg_db }}"
watchtower_key: "{{ (slurped_watchtower_key_data['content'] | b64decode) if slurped_watchtower_key_data['content'] is defined else '### Will be obtained during full run ###' }}"

- name: Ensure docker-compose.yml file.
ansible.builtin.template:
Expand Down