From 93ddda03630b04fbc97d6f10b8a279bfc7f8e149 Mon Sep 17 00:00:00 2001 From: Sebastiaan de Schaetzen Date: Tue, 18 Feb 2025 14:56:52 +0100 Subject: [PATCH] Use ubuntu 24.04 --- .gitea/workflows/release.yaml | 8 ++++---- Dockerfile | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index dfb3788..cd3d38e 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -35,7 +35,7 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - - name: Build and push default 22.04 + - name: Build and push default 24.04 uses: docker/build-push-action@v6 with: context: . @@ -45,11 +45,11 @@ jobs: push: true no-cache: true build-args: | - BASE_IMAGE_TAG=ubuntu-22.04 + BASE_IMAGE_TAG=ubuntu-24.04 IMAGE_VERSION=${{ steps.meta.outputs.IMAGE_VERSION }} IMAGE_CREATED=${{ steps.meta.outputs.IMAGE_CREATED }} IMAGE_REVISION=${{ steps.meta.outputs.IMAGE_REVISION }} tags: | - seeseemelk/runner-images:ubuntu-22.04 - seeseemelk/runner-images:ubuntu-22.04-${{ steps.meta.outputs.IMAGE_VERSION }} + seeseemelk/runner-images:ubuntu-24.04 + seeseemelk/runner-images:ubuntu-24.04-${{ steps.meta.outputs.IMAGE_VERSION }} seeseemelk/runner-images:ubuntu-latest diff --git a/Dockerfile b/Dockerfile index 4a48e40..814d22e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE_TAG=ubuntu-22.04 +ARG BASE_IMAGE_TAG=ubuntu-24.04 FROM gitea/runner-images:${BASE_IMAGE_TAG} @@ -32,7 +32,7 @@ RUN apt-get update && \ cmake \ libsdl2-dev libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev \ golang-1.23 && \ - pip3 install makelove && \ + pip3 install --break-system-packages makelove && \ luarocks install tl ENV PATH="/usr/lib/go-1.23/bin/:$PATH"