Merge pull request #11 from darkwizard242/feature/multi-arch-support

Support multiple Architectures | Remove support for Ubuntu 18.04 and EL 7
darkwizard242 · Jun 22, 2024 · 9b1791d · 9b1791d
2 parents 91dbb17 + 43a86c6
commit 9b1791d
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 11 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -51,7 +51,7 @@ jobs:
     strategy:
       max-parallel: 10
       matrix:
-        IMAGE: [ubuntu-24.04, ubuntu-22.04, ubuntu-20.04, ubuntu-18.04, rockylinux-8, centos-7, debian-bullseye, debian-buster]
+        IMAGE: [ubuntu-24.04, ubuntu-22.04, ubuntu-20.04, rockylinux-8, debian-bullseye, debian-buster]
 
     steps:
 

diff --git a/README.md b/README.md
@@ -17,9 +17,17 @@ Available variables are listed below (located in `defaults/main.yml`):
 ```yaml
 hadolint_app: hadolint
 hadolint_version: 2.12.0
-hadolint_os: Linux
-hadolint_arch: x86_64
-hadolint_dl_url: https://github.com/{{ hadolint_app }}/{{ hadolint_app }}/releases/download/v{{ hadolint_version }}/{{ hadolint_app }}-{{ hadolint_os }}-{{ hadolint_arch }}
+hadolint_os: "{{ ansible_system }}"
+hadolint_architecture_map:
+  amd64: x86_64
+  arm: arm64
+  x86_64: x86_64
+  armv6l: armv6
+  armv7l: armv7
+  aarch64: arm64
+  32-bit: "386"
+  64-bit: x86_64
+hadolint_dl_url: https://github.com/{{ hadolint_app }}/{{ hadolint_app }}/releases/download/v{{ hadolint_version }}/{{ hadolint_app }}-{{ hadolint_os }}-{{ hadolint_architecture_map[ansible_architecture] }}
 hadolint_bin_path: "/usr/local/bin"
 hadolint_bin_permission_mode: '0755'
 ```
@@ -30,8 +38,8 @@ Variable                     | Description
 ---------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------
 hadolint_app                 | Defines the app to install i.e. **hadolint**
 hadolint_version             | Defined to dynamically fetch the desired version to install. Defaults to: **2.12.0**
-hadolint_os                  | Defines os type. Defaults to: **Linux**
-hadolint_arch                | Defines os architecture. Defaults to: **x86_64**
+hadolint_os                  | Defines os type.
+hadolint_architecture_map    | Defines os architecture.
 hadolint_dl_url              | Defines URL to download the hadolint binary from.
 hadolint_bin_path            | Defined to dynamically set the appropriate path to store hadolint binary into. Defaults to (as generally available on any user's PATH): **/usr/local/bin**
 hadolint_bin_permission_mode | Defines the permission mode level for the file. Defaults to: `0755`

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -3,8 +3,16 @@
 
 hadolint_app: hadolint
 hadolint_version: 2.12.0
-hadolint_os: Linux
-hadolint_arch: x86_64
-hadolint_dl_url: https://github.com/{{ hadolint_app }}/{{ hadolint_app }}/releases/download/v{{ hadolint_version }}/{{ hadolint_app }}-{{ hadolint_os }}-{{ hadolint_arch }}
+hadolint_os: "{{ ansible_system }}"
+hadolint_architecture_map:
+  amd64: x86_64
+  arm: arm64
+  x86_64: x86_64
+  armv6l: armv6
+  armv7l: armv7
+  aarch64: arm64
+  32-bit: "386"
+  64-bit: x86_64
+hadolint_dl_url: https://github.com/{{ hadolint_app }}/{{ hadolint_app }}/releases/download/v{{ hadolint_version }}/{{ hadolint_app }}-{{ hadolint_os }}-{{ hadolint_architecture_map[ansible_architecture] }}
 hadolint_bin_path: "/usr/local/bin"
 hadolint_bin_permission_mode: '0755'
diff --git a/meta/main.yml b/meta/main.yml
@@ -13,15 +13,13 @@ galaxy_info:
         - noble
         - jammy
         - focal
-        - bionic
     - name: Debian
       versions:
         - bullseye
         - buster
     - name: EL
       versions:
         - 8
-        - 7
 
   galaxy_tags:
     - hadolint