Index: ps/trunk/build/jenkins/dockerfiles/clang7.Dockerfile =================================================================== --- ps/trunk/build/jenkins/dockerfiles/clang7.Dockerfile (revision 27488) +++ ps/trunk/build/jenkins/dockerfiles/clang7.Dockerfile (nonexistent) @@ -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 Property changes on: ps/trunk/build/jenkins/dockerfiles/clang7.Dockerfile ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Index: ps/trunk/build/jenkins/dockerfiles/build-base.Dockerfile =================================================================== --- ps/trunk/build/jenkins/dockerfiles/build-base.Dockerfile (revision 27488) +++ ps/trunk/build/jenkins/dockerfiles/build-base.Dockerfile (revision 27489) @@ -1,45 +1,46 @@ 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 \ libfreetype6-dev \ libgloox-dev \ libgnutls28-dev \ libgtk-3-dev \ libicu-dev \ libidn11-dev \ libjson-perl \ libminiupnpc-dev \ libogg-dev \ libopenal-dev \ libpng-dev \ libsdl2-dev \ libsodium-dev \ libvorbis-dev \ libwxgtk3.0-dev \ libxcursor-dev \ libxml-simple-perl \ libxml2-dev \ - llvm-7 \ + m4 \ python3-dev \ python3-pip \ zlib1g-dev \ && apt-get clean # Install rust and Cargo via rustup USER builder RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y ENV PATH="${PATH}:/home/builder/.cargo/bin" USER root ENV SHELL /bin/bash + Index: ps/trunk/build/jenkins/dockerfiles/clang8.Dockerfile =================================================================== --- ps/trunk/build/jenkins/dockerfiles/clang8.Dockerfile (nonexistent) +++ ps/trunk/build/jenkins/dockerfiles/clang8.Dockerfile (revision 27489) @@ -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 Property changes on: ps/trunk/build/jenkins/dockerfiles/clang8.Dockerfile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: ps/trunk/build/jenkins/dockerfiles/gcc7-docs.Dockerfile =================================================================== --- ps/trunk/build/jenkins/dockerfiles/gcc7-docs.Dockerfile (nonexistent) +++ ps/trunk/build/jenkins/dockerfiles/gcc7-docs.Dockerfile (revision 27489) @@ -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 Property changes on: ps/trunk/build/jenkins/dockerfiles/gcc7-docs.Dockerfile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: ps/trunk/build/jenkins/dockerfiles/gcc7.Dockerfile =================================================================== --- ps/trunk/build/jenkins/dockerfiles/gcc7.Dockerfile (revision 27488) +++ ps/trunk/build/jenkins/dockerfiles/gcc7.Dockerfile (revision 27489) @@ -1,10 +1,12 @@ 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 ENV LIBCC gcc-7 ENV LIBCXX g++-7 ENV CC gcc-7 ENV CXX g++-7 Index: ps/trunk/build/jenkins/dockerfiles/translations.Dockerfile =================================================================== --- ps/trunk/build/jenkins/dockerfiles/translations.Dockerfile (revision 27488) +++ ps/trunk/build/jenkins/dockerfiles/translations.Dockerfile (revision 27489) @@ -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