From 119a323b7286b74454f3f7e4db6dcb7cee080dc2 Mon Sep 17 00:00:00 2001 From: lisyarus Date: Thu, 28 Mar 2024 15:27:54 +0300 Subject: [PATCH] Update package images to use ubuntu:24.04 with gcc-13 and mingw-13 --- package/linux/Dockerfile | 4 ++-- package/linux/toolchain.cmake | 4 ++-- package/win/Dockerfile | 4 ++-- package/win/toolchain-host.cmake | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/linux/Dockerfile b/package/linux/Dockerfile index 9be11938..1d11a09c 100644 --- a/package/linux/Dockerfile +++ b/package/linux/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 +FROM ubuntu:24.04 # Install tools RUN apt-get update && apt-get upgrade -y && apt-get install -y \ @@ -9,7 +9,7 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \ libasound2-dev libpulse-dev # Set user -RUN useradd -u 1000 -U -d /home -M worker +RUN useradd -u 1000 -U -o -d /home -M worker RUN chown -R worker:worker /home /usr/local USER worker diff --git a/package/linux/toolchain.cmake b/package/linux/toolchain.cmake index 31b9c89a..43548287 100644 --- a/package/linux/toolchain.cmake +++ b/package/linux/toolchain.cmake @@ -1,5 +1,5 @@ -set(CMAKE_C_COMPILER gcc-11) -set(CMAKE_CXX_COMPILER g++-11) +set(CMAKE_C_COMPILER gcc) +set(CMAKE_CXX_COMPILER g++) set(CMAKE_BUILD_TYPE Release) set(PSEMEK_PACKAGE_MODE ON) diff --git a/package/win/Dockerfile b/package/win/Dockerfile index 39bc8b6e..c360c401 100644 --- a/package/win/Dockerfile +++ b/package/win/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 +FROM ubuntu:24.04 # Install tools RUN apt-get update && apt-get upgrade -y && apt-get install -y \ @@ -10,7 +10,7 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \ libxi-dev libxrender-dev # Set user -RUN useradd -u 1000 -U -d /home -M worker +RUN useradd -u 1000 -U -o -d /home -M worker RUN chown -R worker:worker /home /usr/local USER worker diff --git a/package/win/toolchain-host.cmake b/package/win/toolchain-host.cmake index 5497451d..012973f6 100644 --- a/package/win/toolchain-host.cmake +++ b/package/win/toolchain-host.cmake @@ -1,5 +1,5 @@ -set(CMAKE_C_COMPILER gcc-11) -set(CMAKE_CXX_COMPILER g++-11) +set(CMAKE_C_COMPILER gcc) +set(CMAKE_CXX_COMPILER g++) set(CMAKE_BUILD_TYPE Release) set(PSEMEK_PACKAGE_MODE ON)