Merge pull request #1729 from heinezen/fix/ubuntu_docker

Upgrade Ubuntu docker file to 24.04
SFTtech · Dec 8, 2024 · 2b902a9 · 2b902a9
2 parents 0f20032 + 0bd54ce
commit 2b902a9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/ubuntu-22.04.yml → .github/workflows/ubuntu-24.04.yml b/.github/workflows/ubuntu-22.04.yml → .github/workflows/ubuntu-24.04.yml
@@ -1,14 +1,14 @@
-name: Ubuntu 22.04 CI
+name: Ubuntu 24.04 CI
 
 on: [push, workflow_dispatch]
 
 jobs:
   build-devenv:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
     - name: Build the Docker image
-      run: sudo DOCKER_BUILDKIT=1 docker build ./packaging/docker/devenv --file ./packaging/docker/devenv/Dockerfile.ubuntu.2204 --tag openage-devenv:latest
+      run: sudo DOCKER_BUILDKIT=1 docker build ./packaging/docker/devenv --file ./packaging/docker/devenv/Dockerfile.ubuntu.2404 --tag openage-devenv:latest
       shell: bash
     - name: Save the Docker image
       run: |
@@ -24,7 +24,7 @@ jobs:
         retention-days: 30
 
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: build-devenv
     steps:
     - uses: actions/checkout@v4

diff --git a/README.md b/README.md
@@ -88,7 +88,7 @@ If you're interested, we wrote detailed explanations on our blog: [Part 1](https
 |  Operating System   |                                                                                                       Build status                                                                                                        |
 | :-----------------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
 |     Debian Sid      |                                                                                                     [Todo: Kevin #11]                                                                                                     |
-|  Ubuntu 22.04 LTS   |           [![Ubuntu 22.04 build status](https://github.com/SFTTech/openage/actions/workflows/ubuntu-22.04.yml/badge.svg?branch=master)](https://github.com/SFTtech/openage/actions/workflows/ubuntu-22.04.yml)            |
+|  Ubuntu 24.04 LTS   |           [![Ubuntu 24.04 build status](https://github.com/SFTTech/openage/actions/workflows/ubuntu-24.04.yml/badge.svg?branch=master)](https://github.com/SFTtech/openage/actions/workflows/ubuntu-24.04.yml)            |
 |        macOS        |                              [![macOS build status](https://github.com/SFTtech/openage/workflows/macOS-CI/badge.svg)](https://github.com/SFTtech/openage/actions?query=workflow%3AmacOS-CI)                               |
 | Windows Server 2019 | [![Windows Server 2019 build status](https://github.com/SFTtech/openage/actions/workflows/windows-server-2019.yml/badge.svg?branch=master)](https://github.com/SFTtech/openage/actions/workflows/windows-server-2019.yml) |
 | Windows Server 2022 | [![Windows Server 2022 build status](https://github.com/SFTtech/openage/actions/workflows/windows-server-2022.yml/badge.svg?branch=master)](https://github.com/SFTtech/openage/actions/workflows/windows-server-2022.yml) |

diff --git a/...ging/docker/devenv/Dockerfile.ubuntu.2204 → ...ging/docker/devenv/Dockerfile.ubuntu.2404 b/...ging/docker/devenv/Dockerfile.ubuntu.2204 → ...ging/docker/devenv/Dockerfile.ubuntu.2404
@@ -1,4 +1,4 @@
-FROM ubuntu:23.04
+FROM ubuntu:24.04
 
 RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y sudo \
     && sudo apt-get update \
@@ -8,8 +8,8 @@ RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y sudo \
     cmake \
     cython3 \
     flex \
-    gcc-11 \
-    g++-11 \
+    gcc \
+    g++ \
     git \
     libeigen3-dev \
     libepoxy-dev \