From 589c5b0aa667d176dc8b18202ef3d04474d14246 Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Fri, 5 May 2023 21:02:09 +0200 Subject: docker: Update focal images Change-Id: Ide8cb42abc270bb691b2f4caff6412531cbaf50a Reviewed-by: Christian Kandeler --- docker-compose.yml | 10 +++++----- docker/focal/Dockerfile | 8 ++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ceedef4a7..23a27204d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,24 +21,24 @@ services: focal-qt5: &focal-qt5 << : *linux hostname: focal-qt5 - image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-5.15.2_1.20.1-2 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-5.15.2_1.24.1-0 build: dockerfile: docker/focal/Dockerfile context: . args: QT_VERSION: 5.15.2 - QTCREATOR_VERSION: 5.0.3 + QTCREATOR_VERSION: 9.0.2 focal-qt6: << : *linux hostname: focal-qt6 - image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-qt6-6.2.4_1.20.1-1 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-qt6-6.5.0_1.24.1-0 build: dockerfile: docker/focal/Dockerfile context: . args: - QT_VERSION: 6.2.4 - QTCREATOR_VERSION: 5.0.3 + QT_VERSION: 6.5.0 + QTCREATOR_VERSION: 9.0.2 focal: << : *focal-qt5 diff --git a/docker/focal/Dockerfile b/docker/focal/Dockerfile index bc6378912..917d4d0a7 100644 --- a/docker/focal/Dockerfile +++ b/docker/focal/Dockerfile @@ -58,6 +58,7 @@ RUN apt-get update -qq && \ libprotobuf-dev \ libgrpc++-dev \ libxkbcommon-x11-0 \ + locales \ nanopb \ ninja-build \ nsis \ @@ -77,6 +78,13 @@ RUN apt-get update -qq && \ update-alternatives --install /usr/bin/python python /usr/bin/python3 100 && \ pip install beautifulsoup4 lxml protobuf==3.19.1 pyyaml +# Set the locale +RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \ + locale-gen +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en +ENV LC_ALL en_US.UTF-8 + ENV LLVM_INSTALL_DIR=/usr/lib/llvm-12 -- cgit v1.2.1