From 72042f1f3c57fbc51ee7e6dd6791d24bd6b96993 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Thu, 21 Sep 2023 16:07:58 +0100 Subject: [PATCH] ansible: install gcc-10 in remaining Ubuntu 20.04 containers --- ansible/roles/docker/templates/ubuntu2004.Dockerfile.j2 | 2 ++ ansible/roles/docker/templates/ubuntu2004_armv7l.Dockerfile.j2 | 2 ++ 2 files changed, 4 insertions(+) diff --git a/ansible/roles/docker/templates/ubuntu2004.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2004.Dockerfile.j2 index b0a7c4f62..4728fbe74 100644 --- a/ansible/roles/docker/templates/ubuntu2004.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu2004.Dockerfile.j2 @@ -18,6 +18,8 @@ RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \ ccache \ g++-8 \ gcc-8 \ + g++-10 \ + gcc-10 \ git \ openjdk-17-jre-headless \ curl \ diff --git a/ansible/roles/docker/templates/ubuntu2004_armv7l.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2004_armv7l.Dockerfile.j2 index 866a7cec0..5c633be77 100644 --- a/ansible/roles/docker/templates/ubuntu2004_armv7l.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu2004_armv7l.Dockerfile.j2 @@ -16,6 +16,8 @@ ENV DEBIAN_FRONTEND noninteractive RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y ccache \ g++-8 \ gcc-8 \ + g++-10 \ + gcc-10 \ git \ openjdk-17-jre-headless \ pkg-config \