revi-archive/llvm-premerge-checks
1
0
Fork 0
Code Activity

added clang to package dependencies, moved ccache to ssd

Browse source
This commit is contained in:
Christian Kühnel 2019-10-07 19:52:29 +02:00
parent 83b34ae1b5
commit 90e82aee20
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
containers/agent-debian-testing-clang8-ssd/Dockerfile
View file

@ -2,7 +2,7 @@ FROM debian:testing
RUN apt-get update ;\ RUN apt-get update ;\
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
cmake ninja-build git ca-certificates clang-8 lld-8 ccache python python3 build-essential \ cmake ninja-build git ca-certificates clang-8 lld-8 clang ccache python python3 build-essential \
clang-tidy-8 clang-format-8 \ clang-tidy-8 clang-format-8 \
python-psutil arcanist zip \ python-psutil arcanist zip \
openjdk-11-jdk \ openjdk-11-jdk \
@ -32,8 +32,7 @@ RUN chown -R ${user}:${user} /home/${user} ;\
chmod 700 /home/${user}/.ssh chmod 700 /home/${user}/.ssh
WORKDIR /home/${user} WORKDIR /home/${user}
ENV CC=clang-8 ENV CCACHE_PATH=/mnt/disks/ssd0/ccache
ENV CXX=clang++-8
EXPOSE 22 EXPOSE 22
CMD ["/scripts/start_agent.sh"] CMD ["/scripts/start_agent.sh"]

5
containers/agent-debian-testing-clang8-ssd/start_agent.sh
View file

@ -20,8 +20,11 @@ AGENT_ROOT="${SSD_ROOT}/agent"
mkdir -p "${AGENT_ROOT}" mkdir -p "${AGENT_ROOT}"
chown -R jenkins:jenkins "${AGENT_ROOT}" chown -R jenkins:jenkins "${AGENT_ROOT}"
# prepare folder for ccache
mkdir -p "${CCACHE_PATH}"
chown -R jenkins:jenkins "${CCACHE_PATH}"
# TODO(kuhnel): wipe the disk on startup # TODO(kuhnel): wipe the disk on startup
# TODO(kuhnel): move ccache to SDD
# start ssh server # start ssh server
/usr/sbin/sshd -D /usr/sbin/sshd -D

2
containers/agent-debian-testing-clang8/Dockerfile
View file

@ -3,7 +3,7 @@ VOLUME ["/ccache"]
RUN apt-get update ;\ RUN apt-get update ;\
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
cmake ninja-build git ca-certificates clang-8 lld-8 ccache python python3 build-essential \ cmake ninja-build git ca-certificates clang-8 lld-8 clang ccache python python3 build-essential \
clang-tidy-8 clang-format-8 \ clang-tidy-8 clang-format-8 \
python-psutil arcanist zip \ python-psutil arcanist zip \
openjdk-11-jdk \ openjdk-11-jdk \