From f482a386dfa5ab6706f13620e10403934005e415 Mon Sep 17 00:00:00 2001
From: Francesco Biscani <bluescarni@gmail.com>
Date: Fri, 5 Jul 2024 11:26:17 +0200
Subject: [PATCH] Begin updating.

---
 .circleci/config.yml               |  2 +-
 .github/workflows/docker-image.yml | 34 ++++++++++++++++++++++++++----
 Dockerfile2014 => Dockerfile       |  2 +-
 3 files changed, 32 insertions(+), 6 deletions(-)
 rename Dockerfile2014 => Dockerfile (96%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 00ac7d2..b0f0fe8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,7 +14,7 @@ jobs:
         docker-username: DOCKERHUB_USERNAME
         docker-password: DOCKERHUB_TOKEN
     - docker/build:
-        dockerfile: Dockerfile2014
+        dockerfile: Dockerfile
         extra_build_args: --build-arg ARCH=aarch64
         image: $DOCKERHUB_USERNAME/llvm_manylinux2014_aarch64
         tag: latest
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 809f6f1..e6fa59f 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
         name: Login to Docker Hub
         uses: docker/login-action@v2
@@ -26,11 +26,37 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: .
-          file: ./Dockerfile2014
+          file: ./Dockerfile
           platforms: linux/amd64
           push: true
-          # This section is not necessary as this is the default in the Dockerfile,
-          # Added to be explicit
           build-args: |
             ARCH=x86_64
+            MANYLINUXIMG=manylinux2014
           tags: ${{ secrets.DOCKERHUB_USERNAME }}/llvm_manylinux2014_x86_64:latest
+  manylinux_2_28_x86_64:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v4
+      -
+        name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      -
+        name: Build and push amd64
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64
+          push: true
+          build-args: |
+            ARCH=x86_64
+            MANYLINUXIMG=manylinux_2_28
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/llvm_manylinux_2_28_x86_64:latest
diff --git a/Dockerfile2014 b/Dockerfile
similarity index 96%
rename from Dockerfile2014
rename to Dockerfile
index 99ed280..a63dd33 100644
--- a/Dockerfile2014
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 ARG ARCH=x86_64
-FROM quay.io/pypa/manylinux2014_$ARCH
+FROM quay.io/pypa/$MANYLINUXIMG_$ARCH
 
 # We place ourself in some safe location to do all installations
 RUN cd \