Update CI dockerfiles.
This was SVN commit r27489.
This commit is contained in:
parent
d6121a43ea
commit
f88b1a88f6
@ -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
|
||||
|
||||
|
@ -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
|
14
build/jenkins/dockerfiles/clang8.Dockerfile
Normal file
14
build/jenkins/dockerfiles/clang8.Dockerfile
Normal file
@ -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
|
10
build/jenkins/dockerfiles/gcc7-docs.Dockerfile
Normal file
10
build/jenkins/dockerfiles/gcc7-docs.Dockerfile
Normal file
@ -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
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user