adoptium · sxa · Feb 19, 2024 · Feb 19, 2024 · Feb 19, 2024 · Feb 15, 2024
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,20 +1,21 @@
-name: Docker
+--
+name: Create docker build container images
 
 on:
   pull_request:
     paths:
-    - .github/workflows/build.yml
-    - ansible/playbooks/AdoptOpenJDK_Unix_Playbook/**
-    - ansible/docker/**
+      - .github/workflows/build.yml
+      - ansible/playbooks/AdoptOpenJDK_Unix_Playbook/**
+      - ansible/docker/**
     branches:
-    - master
+      - master
   push:
     paths:
-    - .github/workflows/build.yml
-    - ansible/playbooks/AdoptOpenJDK_Unix_Playbook/**
-    - ansible/docker/**
+      - .github/workflows/build.yml
+      - ansible/playbooks/AdoptOpenJDK_Unix_Playbook/**
+      - ansible/docker/**
     branches:
-    - master
+      - master
 
 permissions:
   contents: read
@@ -25,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
 
     - name: Set up Docker Buildx to use cache feature
       uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
@@ -65,7 +66,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
 
     - name: Set up Docker Buildx to use cache feature
       uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0

diff --git a/.github/workflows/build_mac.yml b/.github/workflows/build_mac.yml
@@ -1,12 +1,13 @@
+---
 name: Ansible Playbook
 
 on:
   pull_request:
     paths:
-    - .github/workflows/build_mac.yml
-    - ansible/playbooks/AdoptOpenJDK_Unix_Playbook/**
+      - .github/workflows/build_mac.yml
+      - ansible/playbooks/AdoptOpenJDK_Unix_Playbook/**
     branches:         
-    - master
+      - master
 
 permissions:
   contents: read

diff --git a/.github/workflows/build_qemu.yml b/.github/workflows/build_qemu.yml
@@ -1,12 +1,13 @@
+---
 name: QEMU Playbook Checker
 
 on:
   pull_request:
     paths:
-    - .github/workflows/build_qemu.yml
-    - ansible/playbooks/AdoptOpenJDK_Unix_Playbook/**
+      - .github/workflows/build_qemu.yml
+      - ansible/playbooks/AdoptOpenJDK_Unix_Playbook/**
     branches:       
-    - master
+      - master
     types: [ labeled ]
 
 permissions:

diff --git a/.github/workflows/build_vagrant.yml b/.github/workflows/build_vagrant.yml
@@ -1,12 +1,13 @@
+---
 name: Vagrant Playbook Checker
 
 on:
   pull_request:
     paths:
-    - .github/workflows/build_vagrant.yml
-    - ansible/playbooks/AdoptOpenJDK_Unix_Playbook/**
+      - .github/workflows/build_vagrant.yml
+      - ansible/playbooks/AdoptOpenJDK_Unix_Playbook/**
     branches:
-    - master
+      - master
 
 # Cancel existing runs if user makes another push.
 concurrency:
@@ -22,7 +23,7 @@ jobs:
     runs-on: macos-12
     steps:
 
-    - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
 
     - name: Install dependencies
       run: |

diff --git a/.github/workflows/build_wsl.yml b/.github/workflows/build_wsl.yml
@@ -1,3 +1,4 @@
+---
 name: Windows Playbook Checker
 
 defaults:
@@ -7,10 +8,10 @@ defaults:
 on:
   pull_request:
     paths:
-    - .github/workflows/build_wsl.yml
-    - ansible/playbooks/AdoptOpenJDK_Windows_Playbook/**
+      - .github/workflows/build_wsl.yml
+      - ansible/playbooks/AdoptOpenJDK_Windows_Playbook/**
     branches:
-    - master
+      - master
 
 # Cancel existing runs if user makes another push.
 concurrency:

diff --git a/.github/workflows/check_dockerstatic.yml b/.github/workflows/check_dockerstatic.yml
@@ -1,3 +1,4 @@
+---
 # GH action workflow to check ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/*
 # trigger on PR towards 'master' branch when files in ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic changed
 
@@ -6,10 +7,10 @@ name: DockerStatic Checker
 on:
   pull_request:
     paths:
-    - .github/workflows/check_dockerstatic.yml
-    - ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/**
+      - .github/workflows/check_dockerstatic.yml
+      - ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/**
     branches:         
-    - master
+      - master
 env:
   ROOT_PATH: "ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/"
 
@@ -24,11 +25,11 @@ jobs:
       fail-fast: true
       max-parallel: 4
       matrix:
-       include:
-         - os: alpine3.19
-           dockerfile: "Dockerfile.alp319"
+        include:
+          - os: alpine3.19
+            dockerfile: "Dockerfile.alp319"
     steps:
-    - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
     - name: Test Dockerfile on ${{ matrix.os }}
       env:
         DOCKERFILE: ${{ matrix.dockerfile }}
@@ -45,7 +46,7 @@ jobs:
          - os: centos8
            dockerfile: "Dockerfile.cent8"
     steps:
-    - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
     - name: Test Dockerfile on ${{ matrix.os }}
       env:
         DOCKERFILE: ${{ matrix.dockerfile }}
@@ -58,11 +59,11 @@ jobs:
       fail-fast: true
       max-parallel: 4
       matrix:
-       include:
-         - os: fedora39
-           dockerfile: "Dockerfile.f39"
+        include:
+          - os: fedora39
+            dockerfile: "Dockerfile.f39"
     steps:
-    - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
     - name: Test Dockerfile on ${{ matrix.os }}
       env:
         DOCKERFILE: ${{ matrix.dockerfile }}
@@ -75,13 +76,13 @@ jobs:
       fail-fast: true
       max-parallel: 4
       matrix:
-       include:
-         - os: ubuntu16.04
-           dockerfile: "Dockerfile.u1604"
-         - os: ubuntu18.04
-           dockerfile: "Dockerfile.u1804"
-         - os: ubuntu20.04
-           dockerfile: "Dockerfile.u2004"
+        include:
+          - os: ubuntu16.04
+            dockerfile: "Dockerfile.u1604"
+          - os: ubuntu18.04
+            dockerfile: "Dockerfile.u1804"
+          - os: ubuntu20.04
+            dockerfile: "Dockerfile.u2004"
     steps:
     - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
     - name: Test Dockerfile on ${{ matrix.os }}

diff --git a/.github/workflows/code-freeze.yml b/.github/workflows/code-freeze.yml
@@ -1,9 +1,10 @@
+---
 name: Code Freeze Bot
 
 # Controls when the workflow will run
 on:
   pull_request_target:
-    branches: [ "master" ]
+    branches: ["master"]
   issue_comment:
     types: [created]
 

diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
@@ -1,3 +1,4 @@
+---
 # Label adding bot, see .github/labeler.yml for config
 
 name: "Pull Request Labeler"
@@ -10,12 +11,12 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@5c7539237e04b714afd8ad9b4aed733815b9fab4 # v4.0.2
-      if: ${{ github.event.pull_request }}
-      with:
-        repo-token: "${{ secrets.GITHUB_TOKEN }}"
+      - uses: actions/labeler@5c7539237e04b714afd8ad9b4aed733815b9fab4 # v4.0.2
+        if: ${{ github.event.pull_request }}
+        with:
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"
 
-    - uses: fuxingloh/multi-labeler@fb9bc28b2d65e406ffd208384c5095793c3fd59a # v1.8.0
-      with:
-        github-token: "${{secrets.GITHUB_TOKEN}}"
-        config-path: .github/regex_labeler.yml
+      - uses: fuxingloh/multi-labeler@fb9bc28b2d65e406ffd208384c5095793c3fd59a # v1.8.0
+        with:
+          github-token: "${{secrets.GITHUB_TOKEN}}"
+          config-path: .github/regex_labeler.yml
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -1,17 +1,19 @@
+---
 name: Linter
 
 on:
   pull_request:
     paths:
-    - ansible/**
-    - .ansible-lint
+      - ansible/**
+      - .ansible-lint
+      - .github/workflows/*
     branches:         
-    - master
+      - master
   push:
     paths:
-    - ansible/**
+      - ansible/**
     branches:         
-    - master
+      - master
 
 permissions:
   contents: read
@@ -25,7 +27,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
 
     - name: 'Yamllint'
       uses: karancode/yamllint-github-action@fdef6bc189425ecc84cc4543b2674566c0827053 # v2.1.1
@@ -39,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
 
     - name: Set up Python 3.x
       uses: actions/setup-python@75f3110429a8c05be0e1bf360334e4cced2b63fa # v2.3.3

diff --git a/ansible/docker/Dockerfile.Ubuntu2204 b/ansible/docker/Dockerfile.Ubuntu2204
@@ -18,7 +18,6 @@ RUN rm -rf /ansible
 
 RUN groupadd -g 1000 ${user}
 RUN useradd -c "Jenkins user" -d /home/${user} -u 1000 -g 1000 -m ${user}
-RUN mv /bin/uname /bin/uname.real && echo "/bin/uname.real \$@ | sed 's/aarch64/armv7l/g'" > /bin/uname && chmod 755 /bin/uname
 
 ENV \
     JDK7_BOOT_DIR="/usr/lib/jvm/jdk8" \

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
@@ -148,3 +148,4 @@
     - role: logs
       position: "End"
       tags: always
+# FUDGE TO TRIGGER THE LINTER