From b435169c3149552cb59ca811e13c639ccecd603c Mon Sep 17 00:00:00 2001
From: Stan <Stan@3db68df2-c116-0410-a063-a993310a9797>
Date: Thu, 26 Jan 2023 15:34:52 +0000
Subject: [PATCH] Update CI dockerfiles.

git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@27489 3db68df2-c116-0410-a063-a993310a9797
---
 build/jenkins/dockerfiles/build-base.Dockerfile   |  9 +++++----
 build/jenkins/dockerfiles/clang7.Dockerfile       |  9 ---------
 build/jenkins/dockerfiles/clang8.Dockerfile       | 14 ++++++++++++++
 build/jenkins/dockerfiles/gcc7-docs.Dockerfile    | 10 ++++++++++
 build/jenkins/dockerfiles/gcc7.Dockerfile         |  4 +++-
 build/jenkins/dockerfiles/translations.Dockerfile | 17 +++++++++++++----
 6 files changed, 45 insertions(+), 18 deletions(-)
 delete mode 100644 build/jenkins/dockerfiles/clang7.Dockerfile
 create mode 100644 build/jenkins/dockerfiles/clang8.Dockerfile
 create mode 100644 build/jenkins/dockerfiles/gcc7-docs.Dockerfile

diff --git a/build/jenkins/dockerfiles/build-base.Dockerfile b/build/jenkins/dockerfiles/build-base.Dockerfile
index e151f0010f..060adf31e8 100644
--- a/build/jenkins/dockerfiles/build-base.Dockerfile
+++ b/build/jenkins/dockerfiles/build-base.Dockerfile
@@ -1,14 +1,14 @@
 FROM debian:buster
 
 RUN useradd -ms /bin/bash --uid 1006 builder
-
 # 0 A.D. dependencies.
-RUN apt-get -qq update && apt-get install -qqy \
+ARG DEBIAN_FRONTEND=noninteractive
+ARG DEBCONF_NOWARNINGS="yes"
+RUN apt-get -qqy update && apt-get install -qqy \
       cmake \
       curl \
       libboost-dev \
       libboost-filesystem-dev \
-      libclang-7-dev \
       libcurl4-gnutls-dev \
       libenet-dev \
       libfmt-dev \
@@ -30,7 +30,7 @@ RUN apt-get -qq update && apt-get install -qqy \
       libxcursor-dev \
       libxml-simple-perl \
       libxml2-dev \
-      llvm-7 \
+      m4 \
       python3-dev \
       python3-pip \
       zlib1g-dev \
@@ -43,3 +43,4 @@ ENV PATH="${PATH}:/home/builder/.cargo/bin"
 USER root
 
 ENV SHELL /bin/bash
+
diff --git a/build/jenkins/dockerfiles/clang7.Dockerfile b/build/jenkins/dockerfiles/clang7.Dockerfile
deleted file mode 100644
index a776b5edf1..0000000000
--- a/build/jenkins/dockerfiles/clang7.Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM build-base:latest
-
-RUN apt-get install -qqy clang-7 lld-7
-
-USER builder
-
-ENV CC clang-7
-ENV CXX clang++-7
-ENV LDFLAGS -fuse-ld=lld-7
diff --git a/build/jenkins/dockerfiles/clang8.Dockerfile b/build/jenkins/dockerfiles/clang8.Dockerfile
new file mode 100644
index 0000000000..630b6571c7
--- /dev/null
+++ b/build/jenkins/dockerfiles/clang8.Dockerfile
@@ -0,0 +1,14 @@
+FROM build-base:latest
+
+# Obviously clang8 is not available but 13 is ^^"
+
+ARG DEBIAN_FRONTEND=noninteractive
+ARG DEBCONF_NOWARNINGS="yes"
+RUN echo "deb https://deb.debian.org/debian buster-backports main" > /etc/apt/sources.list.d/backports.list
+RUN apt-get update && apt-get install -qqy llvm-8 clang-8 lld-8 libclang-8-dev --no-install-recommends
+
+USER builder
+
+ENV CC clang-8
+ENV CXX clang++-8
+ENV LDFLAGS -fuse-ld=lld-8
diff --git a/build/jenkins/dockerfiles/gcc7-docs.Dockerfile b/build/jenkins/dockerfiles/gcc7-docs.Dockerfile
new file mode 100644
index 0000000000..c8628e1682
--- /dev/null
+++ b/build/jenkins/dockerfiles/gcc7-docs.Dockerfile
@@ -0,0 +1,10 @@
+FROM 0ad-gcc7:latest
+
+USER root
+
+ARG DEBIAN_FRONTEND=noninteractive
+ARG DEBCONF_NOWARNINGS="yes"
+RUN apt-get install -qqy graphviz doxygen xsltproc lcov --no-install-recommends
+RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 7 --slave /usr/bin/g++ g++ /usr/bin/g++-7 --slave /usr/bin/gcov gcov /usr/bin/gcov-7
+
+USER builder
diff --git a/build/jenkins/dockerfiles/gcc7.Dockerfile b/build/jenkins/dockerfiles/gcc7.Dockerfile
index 88d6cf27f3..c8581b3744 100644
--- a/build/jenkins/dockerfiles/gcc7.Dockerfile
+++ b/build/jenkins/dockerfiles/gcc7.Dockerfile
@@ -1,6 +1,8 @@
 FROM build-base:latest
 
-RUN apt-get install -qqy gcc-7 g++-7
+ARG DEBIAN_FRONTEND=noninteractive
+ARG DEBCONF_NOWARNINGS="yes"
+RUN apt-get install -qqy gcc-7 g++-7 llvm-7 libclang-7-dev --no-install-recommends
 
 USER builder
 
diff --git a/build/jenkins/dockerfiles/translations.Dockerfile b/build/jenkins/dockerfiles/translations.Dockerfile
index 3e252544f0..7b03b5502e 100644
--- a/build/jenkins/dockerfiles/translations.Dockerfile
+++ b/build/jenkins/dockerfiles/translations.Dockerfile
@@ -1,9 +1,18 @@
-FROM build-base
+FROM debian:buster
 
-# This silences a transifex-client warning
-RUN apt-get install -qqy git subversion
+ARG DEBIAN_FRONTEND=noninteractive
+ARG DEBCONF_NOWARNINGS="yes"
+RUN useradd -ms /bin/bash --uid 1006 builder
+RUN apt-get -qq update && apt-get install -qqy --no-install-recommends \
+      curl \
+      python3-dev \
+      python3-pip \
+      git \
+      subversion \
+ && apt-get clean
 
+ENV SHELL /bin/bash
+RUN pip3 install setuptools wheel
 RUN pip3 install transifex-client lxml babel
-
 USER builder
 COPY --chown=builder transifexrc /home/builder/.transifexrc
-- 
2.11.4.GIT