From 46e874f997a1753a168b317edfd6fc1521df0d82 Mon Sep 17 00:00:00 2001
From: Mischa ter Smitten <mischa@tersmitten.nl>
Date: Mon, 4 Jul 2022 16:35:45 +0200
Subject: [PATCH] Consistency changes

---
 .github/workflows/ci.yml         |  7 +++----
 Dockerfile                       | 13 ++++++++-----
 meta/main.yml                    |  5 ++---
 molecule/default/collections.yml |  6 ++++++
 molecule/default/converge.yml    |  2 +-
 requirements.yml                 |  3 +++
 tasks/main.yml                   |  6 +++---
 tests/test.yml                   |  2 +-
 8 files changed, 27 insertions(+), 17 deletions(-)
 create mode 100644 molecule/default/collections.yml
 create mode 100644 requirements.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7c00f3c..5e5c0cf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,7 +23,9 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies
-        run: pip install ansible-lint[community,yamllint]
+        run: |
+          pip install ansible-lint
+          ansible-galaxy install -r requirements.yml
 
       - name: Lint code
         run: |
@@ -43,11 +45,8 @@ jobs:
       matrix:
         include:
           - distro: debian8
-            ansible-version: '<2.10'
           - distro: debian9
           - distro: debian10
-          - distro: ubuntu1604
-            ansible-version: '>=2.9, <2.10'
           - distro: ubuntu1604
             ansible-version: '>=2.10, <2.11'
           - distro: ubuntu1604
diff --git a/Dockerfile b/Dockerfile
index b179278..6ebe0c4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,20 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 MAINTAINER Mischa ter Smitten <mtersmitten@oefenweb.nl>
 
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8
+
 # python
 RUN apt-get update && \
-  DEBIAN_FRONTEND=noninteractive apt-get install -y python-minimal python-dev curl && \
+  DEBIAN_FRONTEND=noninteractive apt-get install -y python3-minimal python3-dev curl && \
   apt-get clean
-RUN curl -sL https://bootstrap.pypa.io/pip/2.7/get-pip.py | python -
+RUN curl -sL https://bootstrap.pypa.io/pip/3.6/get-pip.py | python3 -
 RUN rm -rf $HOME/.cache
 
 # ansible
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y gcc libffi-dev libssl-dev && \
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y python3-apt && \
   apt-get clean
-RUN pip install ansible==2.9.15
+RUN pip3 install ansible==2.10.7
 RUN rm -rf $HOME/.cache
 
 # provision
diff --git a/meta/main.yml b/meta/main.yml
index de0cb4d..94df4ec 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,13 +1,12 @@
 # meta file
 ---
 galaxy_info:
-  namespace: oefenweb
+  author: oefenweb
   role_name: adminer
-  author: Mischa ter Smitten
   company: Oefenweb.nl B.V.
   description: Set up adminer (Database management in a single PHP file)
   license: MIT
-  min_ansible_version: 2.9.0
+  min_ansible_version: 2.10.0
   platforms:
     - name: Ubuntu
       versions:
diff --git a/molecule/default/collections.yml b/molecule/default/collections.yml
new file mode 100644
index 0000000..c3d7e2a
--- /dev/null
+++ b/molecule/default/collections.yml
@@ -0,0 +1,6 @@
+---
+collections:
+  - name: community.docker
+    version: '>=1.2.0,<2'
+  - name: community.general
+    version: '>=2,<3'
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
index 73043c4..8596f09 100644
--- a/molecule/default/converge.yml
+++ b/molecule/default/converge.yml
@@ -4,6 +4,6 @@
   become: true
   pre_tasks:
     - name: include vars
-      include_vars: "{{ playbook_dir }}/../../tests/vars/main.yml"
+      ansible.builtin.include_vars: "{{ playbook_dir }}/../../tests/vars/main.yml"
   roles:
     - ../../../
diff --git a/requirements.yml b/requirements.yml
new file mode 100644
index 0000000..3d5f1cd
--- /dev/null
+++ b/requirements.yml
@@ -0,0 +1,3 @@
+# requirements file
+---
+collections: []
diff --git a/tasks/main.yml b/tasks/main.yml
index a24de28..c2dea7a 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: create (download) directory
-  file:
+  ansible.builtin.file:
     path: "{{ adminer_download_path }}"
     state: directory
     owner: root
@@ -13,7 +13,7 @@
     - adminer-download
 
 - name: download (latest)
-  get_url:
+  ansible.builtin.get_url:
     url: "{{ adminer_download_url }}"
     dest: "{{ adminer_download_path }}/latest.php"
     owner: root
@@ -27,7 +27,7 @@
     - adminer-download
 
 - name: install
-  file:
+  ansible.builtin.file:
     src: "{{ adminer_download_path }}/latest.php"
     dest: "{{ item }}/adminer.php"
     state: link
diff --git a/tests/test.yml b/tests/test.yml
index c2fbb9f..8d7cd5f 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -5,6 +5,6 @@
   become: true
   pre_tasks:
     - name: include vars
-      include_vars: "{{ playbook_dir }}/vars/main.yml"
+      ansible.builtin.include_vars: "{{ playbook_dir }}/vars/main.yml"
   roles:
     - ../../