Merge branch 'master' into i_hate_linters

sxa · Feb 19, 2024 · 9e0b43e · 9e0b43e
2 parents f42e054 + 8c2720b
commit 9e0b43e
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 225 deletions.
diff --git a/.github/workflows/check_dockerstatic.yml b/.github/workflows/check_dockerstatic.yml
@@ -26,14 +26,8 @@ jobs:
       max-parallel: 4
       matrix:
         include:
-          - os: alpine13.1
-            dockerfile: "Dockerfile.alp311"
-          - os: alpine13.2
-            dockerfile: "Dockerfile.alp312"
-          - os: alpine13.3
-            dockerfile: "Dockerfile.alp313"
-          - os: alpine13.4
-            dockerfile: "Dockerfile.alp314"
+          - os: alpine3.19
+            dockerfile: "Dockerfile.alp319"
     steps:
       - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
     - name: Test Dockerfile on ${{ matrix.os }}
@@ -66,12 +60,8 @@ jobs:
       max-parallel: 4
       matrix:
         include:
-          - os: fedora33
-            dockerfile: "Dockerfile.f33"
-          - os: fedora34
-            dockerfile: "Dockerfile.f34"
-          - os: fedora35
-            dockerfile: "Dockerfile.f35"
+          - os: fedora39
+            dockerfile: "Dockerfile.f39"
     steps:
       - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
     - name: Test Dockerfile on ${{ matrix.os }}

diff --git a/...ble/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.alp312 b/...ble/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.alp312
diff --git a/...ble/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.alp313 b/...ble/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.alp313
diff --git a/...ble/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.alp314 b/...ble/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.alp314
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.f33 b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.f33
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.f34 b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.f34