From af445f905b7d15e38cea9fae848cc761605a52e2 Mon Sep 17 00:00:00 2001 From: Pentarctagon Date: Thu, 21 Apr 2022 19:08:20 -0500 Subject: [PATCH] Update docker images to Ubuntu 22.04. --- ...ockerfile-base-2004-master => Dockerfile-base-2204-master} | 4 ++-- utils/dockerbuilds/CI/Dockerfile-base-flatpak | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename utils/dockerbuilds/CI/{Dockerfile-base-2004-master => Dockerfile-base-2204-master} (56%) diff --git a/utils/dockerbuilds/CI/Dockerfile-base-2004-master b/utils/dockerbuilds/CI/Dockerfile-base-2204-master similarity index 56% rename from utils/dockerbuilds/CI/Dockerfile-base-2004-master rename to utils/dockerbuilds/CI/Dockerfile-base-2204-master index 1ca1f5ade3e..2a5c091c8ee 100644 --- a/utils/dockerbuilds/CI/Dockerfile-base-2004-master +++ b/utils/dockerbuilds/CI/Dockerfile-base-2204-master @@ -1,11 +1,11 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.04 RUN apt update RUN apt install -y -qq apt-utils # boost -RUN apt install -y -qq libboost-filesystem1.71-dev libboost-filesystem1.71.0 libboost-iostreams1.71-dev libboost-iostreams1.71.0 libboost-locale1.71-dev libboost-locale1.71.0 libboost-regex1.71-dev libboost-regex1.71.0 libboost-serialization1.71-dev libboost-serialization1.71.0 libasio-dev libboost-program-options1.71-dev libboost-program-options1.71.0 libboost-random1.71-dev libboost-random1.71.0 libboost-system1.71-dev libboost-system1.71.0 libboost-thread1.71-dev libboost-thread1.71.0 libboost-test-dev libboost-context1.71.0 libboost-context1.71-dev libboost-coroutine1.71.0 libboost-coroutine1.71-dev +RUN apt install -y -qq libboost-filesystem1.74-dev libboost-filesystem1.74.0 libboost-iostreams1.74-dev libboost-iostreams1.74.0 libboost-locale1.74-dev libboost-locale1.74.0 libboost-regex1.74-dev libboost-regex1.74.0 libboost-serialization1.74-dev libboost-serialization1.74.0 libasio-dev libboost-program-options1.74-dev libboost-program-options1.74.0 libboost-random1.74-dev libboost-random1.74.0 libboost-system1.74-dev libboost-system1.74.0 libboost-thread1.74-dev libboost-thread1.74.0 libboost-test-dev libboost-context1.74.0 libboost-context1.74-dev libboost-coroutine1.74.0 libboost-coroutine1.74-dev # SDL RUN apt install -y -qq libsdl2-2.0-0 libsdl2-dev libsdl2-image-2.0-0 libsdl2-image-dev libsdl2-mixer-2.0-0 libsdl2-mixer-dev diff --git a/utils/dockerbuilds/CI/Dockerfile-base-flatpak b/utils/dockerbuilds/CI/Dockerfile-base-flatpak index 45e97c5354c..fb6c679f8c0 100644 --- a/utils/dockerbuilds/CI/Dockerfile-base-flatpak +++ b/utils/dockerbuilds/CI/Dockerfile-base-flatpak @@ -1,4 +1,4 @@ -FROM wesnoth/wesnoth:2004-master +FROM wesnoth/wesnoth:2204-master RUN apt update # install flatpak