From 37e21e208f4326b13952bbfe28d382254b329af7 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Mon, 13 Jul 2020 20:53:28 -0700
Subject: [PATCH] docker: Add gcc-10/clang-10 images.

---
 docker/build-and-push-images.sh   |  4 ++++
 docker/ubuntu/clang-10/Dockerfile | 10 ++++++++++
 docker/ubuntu/gcc-10/Dockerfile   | 11 +++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 docker/ubuntu/clang-10/Dockerfile
 create mode 100644 docker/ubuntu/gcc-10/Dockerfile

diff --git a/docker/build-and-push-images.sh b/docker/build-and-push-images.sh
index 67df9fc58..cfb3a970b 100755
--- a/docker/build-and-push-images.sh
+++ b/docker/build-and-push-images.sh
@@ -3,9 +3,13 @@ BASEDIR=$(dirname "$0")
 
 docker build -t jevolk/construct:ubuntu-20.04 $BASEDIR/ubuntu/base
 docker build -t jevolk/construct:ubuntu-20.04-clang-9 $BASEDIR/ubuntu/clang-9
+docker build -t jevolk/construct:ubuntu-20.04-clang-10 $BASEDIR/ubuntu/clang-10
 docker build -t jevolk/construct:ubuntu-20.04-gcc-8 $BASEDIR/ubuntu/gcc-8
 docker build -t jevolk/construct:ubuntu-20.04-gcc-9 $BASEDIR/ubuntu/gcc-9
+docker build -t jevolk/construct:ubuntu-20.04-gcc-10 $BASEDIR/ubuntu/gcc-10
 
 docker push jevolk/construct:ubuntu-20.04-clang-9
+docker push jevolk/construct:ubuntu-20.04-clang-10
 docker push jevolk/construct:ubuntu-20.04-gcc-8
 docker push jevolk/construct:ubuntu-20.04-gcc-9
+docker push jevolk/construct:ubuntu-20.04-gcc-10
diff --git a/docker/ubuntu/clang-10/Dockerfile b/docker/ubuntu/clang-10/Dockerfile
new file mode 100644
index 000000000..0a670f78c
--- /dev/null
+++ b/docker/ubuntu/clang-10/Dockerfile
@@ -0,0 +1,10 @@
+FROM jevolk/construct:ubuntu-20.04
+
+ENV CC clang-10
+ENV CXX clang++-10
+
+RUN apt-get update \
+   && apt-get install --no-install-recommends -y clang-10 llvm-10-dev \
+   && apt-get clean -y \
+   && rm -rf /var/lib/apt/lists/*
+
diff --git a/docker/ubuntu/gcc-10/Dockerfile b/docker/ubuntu/gcc-10/Dockerfile
new file mode 100644
index 000000000..f6677bc24
--- /dev/null
+++ b/docker/ubuntu/gcc-10/Dockerfile
@@ -0,0 +1,11 @@
+FROM jevolk/construct:ubuntu-20.04
+
+ENV CXX g++-10
+ENV CC gcc-10
+
+RUN apt-get update \
+   && apt-get install --no-install-recommends -y software-properties-common \
+   && apt-get update \
+   && apt-get install --no-install-recommends -y g++-10 gcc-10 \
+   && apt-get clean -y \
+   && rm -rf /var/lib/apt/lists/*