Deprecate old Ubuntu 20.04 (Focal)

guydavis · Feb 16, 2025 · c899ee0 · c899ee0
1 parent 8d35e0d
commit c899ee0
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 167 deletions.
diff --git a/.github/workflows/develop-base.yaml b/.github/workflows/develop-base.yaml
@@ -78,41 +78,3 @@ jobs:
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-jammy:develop
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-jammy:develop
-
-  docker-focal:
-    runs-on: ubuntu-20.04
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v3
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - 
-        name: Login to DockerHub
-        uses: docker/login-action@v2 
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Login to GitHub Container Registry
-        uses: docker/login-action@v2 
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          file: docker/dockerfile-focal.base
-          context: .
-          platforms: linux/amd64
-          provenance: false
-          push: true
-          tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-focal:develop
-            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-focal:develop
diff --git a/.github/workflows/main-base.yaml b/.github/workflows/main-base.yaml
@@ -42,7 +42,7 @@ jobs:
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-noble:latest
 
   docker-jammy:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       -
         name: Checkout
@@ -79,40 +79,3 @@ jobs:
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-jammy:latest
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-jammy:latest
 
-  docker-focal:
-    runs-on: ubuntu-20.04
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v3
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - 
-        name: Login to DockerHub
-        uses: docker/login-action@v2 
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Login to GitHub Container Registry
-        uses: docker/login-action@v2 
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          file: docker/dockerfile-focal.base
-          context: .
-          platforms: linux/amd64,linux/arm64
-          provenance: false
-          push: true
-          tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-focal:latest
-            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-focal:latest
diff --git a/.github/workflows/test-base.yaml b/.github/workflows/test-base.yaml
@@ -42,7 +42,7 @@ jobs:
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-noble:test
 
   docker-jammy:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       -
         name: Checkout
@@ -79,39 +79,3 @@ jobs:
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-jammy:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-jammy:test
 
-  docker-focal:
-    runs-on: ubuntu-20.04
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v3
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - 
-        name: Login to DockerHub
-        uses: docker/login-action@v2 
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Login to GitHub Container Registry
-        uses: docker/login-action@v2 
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          file: docker/dockerfile-focal.base
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-focal:test
-            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-focal:test
diff --git a/docker/dockerfile-focal.base b/docker/dockerfile-focal.base