Add support for Alpine 3.12 (#317)

And remove support for Alpine 3.8

CHANGELOG.md

@@ -7,6 +7,11 @@ BREAKING CHANGES:
 *   The process to install modules has changed. You will now have to use a list variable, `nginx_modules`, instead of manually setting the modules you want to install to `true` or `false`. This change will also simplify adding future supported modules to this role. You can find a list of supported modules for NGINX and NGINX Plus in [`vars/main.yml`](https://github.com/nginxinc/ansible-role-nginx/blob/master/vars/main.yml).
 *   Modules can no longer be added to your NGINX config using this role. Please use the [`nginx_config`](https://github.com/nginxinc/ansible-role-nginx-config) role instead.
 
+FEATURES:
+
+*   Add Alpine 3.12 to the list of supported platforms
+*   Remove Alpine 3.8 from the list of supported platforms
+
 ENHANCEMENTS:
 
 *   Update Ansible to `2.9.13` and Ansible Lint to `4.3.4`.

README.md

@@ -2,7 +2,7 @@ Ansible NGINX Role
 ==================
 
 [![Ansible Galaxy](https://img.shields.io/badge/galaxy-nginxinc.nginx-5bbdbf.svg)](https://galaxy.ansible.com/nginxinc/nginx)
-[![Build Status](https://travis-ci.org/nginxinc/ansible-role-nginx.svg?branch=master)](https://travis-ci.org/nginxinc/ansible-role-nginx)
+[![Build Status](https://travis-ci.org/nginxinc/ansible-role-nginx.svg?branch=main)](https://travis-ci.org/nginxinc/ansible-role-nginx)
 
 This role installs NGINX Open Source, NGINX Plus, the NGINX Amplify agent, or NGINX Unit on your target host.
 
@@ -48,141 +48,113 @@ The NGINX Ansible role supports all platforms supported by [NGINX Open Source](h
 
 ```yaml
 Alpine:
-  versions:
+  - 3.9
-    - 3.8
+  - 3.10
-    - 3.9
+  - 3.11
-    - 3.10
+  - 3.12
-    - 3.11
 CentOS:
-  versions:
+  - 6
-    - 6
+  - 7
-    - 7
+  - 8
-    - 8
 Debian:
-  versions:
+  - stretch
-    - stretch
+  - buster
-    - buster
 FreeBSD:
-  versions:
+  - 11.2+
-    - 11.2+
+  - 12
-    - 12
 RedHat:
-  versions:
+  - 6
-    - 6
+  - 7.4+
-    - 7.4+
+  - 8
-    - 8
 SUSE/SLES:
-  versions:
+  - 12
-    - 12
+  - 15
-    - 15
 Ubuntu:
-  versions:
+  - xenial
-    - xenial
+  - bionic
-    - bionic
+  - focal
-    - focal
 ```
 
 **NGINX Plus**
 
 ```yaml
 Alpine:
-  versions:
+  - 3.9
-    - 3.8
+  - 3.10
-    - 3.9
+  - 3.11
-    - 3.10
+  - 3.12
-    - 3.11
 Amazon Linux:
-  versions:
+  - 2018.03
-    - 2018.03
 Amazon Linux 2:
-  versions:
+  - any
-    - any
 CentOS:
-  versions:
+  - 6.5+
-    - 6.5+
+  - 7.4+
-    - 7.4+
+  - 8
-    - 8
 Debian:
-  versions:
+  - stretch
-    - stretch
+  - buster
-    - buster
 FreeBSD:
-  versions:
+  - 11.2+
-    - 11.2+
+  - 12
-    - 12
 Oracle Linux:
-  versions:
+  - 6.5+
-    - 6.5+
+  - 7.4+
-    - 7.4+
 RedHat:
-  versions:
+  - 6.5+
-    - 6.5+
+  - 7.4+
-    - 7.4+
+  - 8
-    - 8
 SUSE/SLES:
-  versions:
+  - 12
-    - 12
+  - 15
-    - 15
 Ubuntu:
-  versions:
+  - xenial
-    - xenial
+  - bionic
-    - bionic
+  - focal
-    - focal
 ```
 
 **NGINX Amplify Agent**
 
 ```yaml
 Amazon Linux:
-  versions:
+  - 2017.09
-    - 2017.09
 CentOS:
-  versions:
+  - 6
-    - 6
+  - 7
-    - 7
 Debian:
-  versions:
+  - jessie
-    - jessie
+  - stretch
-    - stretch
 RedHat:
-  versions:
+  - 6
-    - 6
+  - 7
-    - 7
 Ubuntu:
-  versions:
+  - xenial
-    - xenial
+  - bionic
-    - bionic
+  - focal
-    - focal
 ```
 
 **NGINX Unit**
 
 ```yaml
 Amazon Linux:
-  versions:
+  - 2018.03
-    - 2018.03
 Amazon Linux 2:
-  versions:
+  - any
-    - any
 CentOS:
-  versions:
+  - 6
-    - 6
+  - 7
-    - 7
+  - 8
-    - 8
 Debian:
-  versions:
+  - stretch
-    - stretch
+  - buster
-    - buster
 RedHat:
-  versions:
+  - 6
-    - 6
+  - 7
-    - 7
+  - 8
-    - 8
 Ubuntu:
-  versions:
+  - xenial
-    - xenial
+  - bionic
-    - bionic
+  - focal
-    - focal
 ```
 
 Role Variables

molecule/common/playbooks/default_converge.yml

@@ -4,15 +4,15 @@
   pre_tasks:
     - name: Set repo if Alpine
       set_fact:
-        version: "=1.17.10-r1"
+        version: "=1.19.1-r1"
       when: ansible_os_family == "Alpine"
     - name: Set repo if Debian
       set_fact:
-        version: "=1.17.10-1~{{ ansible_distribution_release }}"
+        version: "=1.19.1-1~{{ ansible_distribution_release }}"
       when: ansible_os_family == "Debian"
     - name: Set repo if RedHat
       set_fact:
-        version: "-1.17.10-1.el{{ ansible_distribution_major_version }}.ngx"
+        version: "-1.19.1-1.el{{ ansible_distribution_major_version }}.ngx"
       when: ansible_os_family == "RedHat"
     - name: Enable NGINX @CentOS-AppStream dnf modules
       shell:

molecule/common/playbooks/template_converge.yml

@@ -6,14 +6,7 @@
       include_role:
         name: ansible-role-nginx
       vars:
-        # nginx_debug_output: true
+        nginx_debug_output: true
-
-        nginx_service_modify: true
-        nginx_service_timeout: 95
-        nginx_selinux: true
-        nginx_selinux_tcp_ports:
-          - 80
-          - 443
 
         nginx_main_template_enable: true
         nginx_main_template:

molecule/default_alpine/molecule.yml

@@ -6,13 +6,6 @@ lint: |
   yamllint .
   ansible-lint --force-color
 platforms:
-  - name: alpine-3.8
-    image: alpine:3.8
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
   - name: alpine-3.9
     image: alpine:3.9
     dockerfile: ../common/Dockerfile.j2
@@ -34,6 +27,13 @@ platforms:
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/sbin/init"
+  - name: alpine-3.12
+    image: alpine:3.12
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
 provisioner:
   name: ansible
   playbooks:

molecule/module_alpine/molecule.yml

@@ -6,13 +6,6 @@ lint: |
   yamllint .
   ansible-lint --force-color
 platforms:
-  - name: alpine-3.8
-    image: alpine:3.8
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
   - name: alpine-3.9
     image: alpine:3.9
     dockerfile: ../common/Dockerfile.j2
@@ -34,6 +27,13 @@ platforms:
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/sbin/init"
+  - name: alpine-3.12
+    image: alpine:3.12
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
 provisioner:
   name: ansible
   playbooks:

molecule/source_alpine/molecule.yml

@@ -6,13 +6,6 @@ lint: |
   yamllint .
   ansible-lint --force-color
 platforms:
-  - name: alpine-3.8
-    image: alpine:3.8
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
   - name: alpine-3.9
     image: alpine:3.9
     dockerfile: ../common/Dockerfile.j2
@@ -21,14 +14,21 @@ platforms:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/sbin/init"
   - name: alpine-3.10
-    image: python:alpine3.10
+    image: alpine:3.10
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/sbin/init"
   - name: alpine-3.11
-    image: python:alpine3.11
+    image: alpine:3.11
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
+  - name: alpine-3.12
+    image: alpine:3.12
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     volumes:

molecule/stable_push_alpine/molecule.yml

@@ -6,13 +6,6 @@ lint: |
   yamllint .
   ansible-lint --force-color
 platforms:
-  - name: alpine-3.8
-    image: alpine:3.8
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
   - name: alpine-3.9
     image: alpine:3.9
     dockerfile: ../common/Dockerfile.j2
@@ -34,6 +27,13 @@ platforms:
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/sbin/init"
+  - name: alpine-3.12
+    image: alpine:3.12
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
 provisioner:
   name: ansible
   playbooks:

molecule/template_alpine/molecule.yml

@@ -6,13 +6,6 @@ lint: |
   yamllint .
   ansible-lint --force-color
 platforms:
-  - name: alpine-3.8
-    image: alpine:3.8
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
   - name: alpine-3.9
     image: alpine:3.9
     dockerfile: ../common/Dockerfile.j2
@@ -34,6 +27,13 @@ platforms:
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/sbin/init"
+  - name: alpine-3.12
+    image: alpine:3.12
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
 provisioner:
   name: ansible
   playbooks:

molecule/unit_alpine/molecule.yml

@@ -6,13 +6,6 @@ lint: |
   yamllint .
   ansible-lint --force-color
 platforms:
-  - name: alpine-3.8
-    image: alpine:3.8
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
   - name: alpine-3.9
     image: alpine:3.9
     dockerfile: ../common/Dockerfile.j2
@@ -34,6 +27,13 @@ platforms:
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/sbin/init"
+  - name: alpine-3.12
+    image: alpine:3.12
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
 provisioner:
   name: ansible
   playbooks:

tasks/opensource/setup-source.yml

@@ -60,7 +60,7 @@
     - name: "(Install: Alpine) Install Build Tools"
       apk:
         name:
-          - python
+          - python3
           - alpine-sdk
           - build-base
           - git