From 77b08754c6175eb41c1b609edab14dffabdcb734 Mon Sep 17 00:00:00 2001
From: Mikhail Goncharov <goncharov.mikhail@gmail.com>
Date: Thu, 18 Jun 2020 16:16:07 +0200
Subject: [PATCH] use unstable debian release

---
 containers/base-debian/Dockerfile             | 24 ++++++++++---------
 .../buildkite-premerge-debian/start_agent.sh  |  4 +++-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/containers/base-debian/Dockerfile b/containers/base-debian/Dockerfile
index b47607d..c9ff238 100644
--- a/containers/base-debian/Dockerfile
+++ b/containers/base-debian/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:buster
+FROM debian:unstable
 
 RUN echo 'intall build dependencies'; \
     apt-get update ;\
@@ -12,21 +12,14 @@ RUN echo 'intall build dependencies'; \
         python3-pip python3-setuptools \
         swig python3-dev libedit-dev libncurses5-dev libxml2-dev liblzma-dev golang rsync jq;
 RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - ;\
-    echo "deb http://apt.llvm.org/buster/ llvm-toolchain-buster-10 main\ndeb-src http://apt.llvm.org/buster/ llvm-toolchain-buster-10 main\n$(cat /etc/apt/sources.list)" > /etc/apt/sources.list ;\
+    echo "deb http://apt.llvm.org/unstable/ llvm-toolchain-10 main\ndeb-src http://apt.llvm.org/unstable/ llvm-toolchain-10 main\n$(cat /etc/apt/sources.list)" > /etc/apt/sources.list ;\
     cat /etc/apt/sources.list; \
     apt-get update ;\
     apt-get upgrade -y ;\
     apt-get install -y \
         clang-10 lld-10 clang-tidy-10 clang-format-10 \
         ;\
-    ln -s /usr/bin/clang-10 /usr/bin/clang;\
-    ln -s /usr/bin/clang++-10 /usr/bin/clang++;\
-    ln -s /usr/bin/clang-tidy-10 /usr/bin/clang-tidy;\
-    ln -s /usr/bin/clang-tidy-diff-10 /usr/bin/clang-tidy-diff;\
-    ln -s /usr/bin/clang-format-10 /usr/bin/clang-format;\
-    ln -s /usr/bin/clang-format-diff-10 /usr/bin/clang-format-diff;\
-    ln -s /usr/bin/lld-10 /usr/bin/lld;\
-    apt-get clean;
+    apt-get clean
 
 RUN echo 'configure locale'; \
     sed --in-place '/en_US.UTF-8/s/^#//' /etc/locale.gen ;\
@@ -43,4 +36,13 @@ ENV LC_ALL en_US.UTF-8
 # Install python dependencies for the scripts. ADD will check contentents of a file for changes changed.
 # TODO: that should be done during the build as it will pull this repo anyway and will have latest version.
 ADD "https://raw.githubusercontent.com/google/llvm-premerge-checks/master/scripts/requirements.txt" requirements.txt
-RUN pip3 install -r requirements.txt
\ No newline at end of file
+RUN pip3 install -r requirements.txt
+
+RUN ln -s /usr/bin/clang-10 /usr/bin/clang;\
+    ln -s /usr/bin/clang++-10 /usr/bin/clang++;\
+    ln -s /usr/bin/clang-tidy-10 /usr/bin/clang-tidy;\
+    ln -s /usr/bin/clang-tidy-diff-10.py /usr/bin/clang-tidy-diff;\
+    ln -s /usr/bin/clang-format-10 /usr/bin/clang-format;\
+    ln -s /usr/bin/git-clang-format-10 /usr/bin/git-clang-format;\
+    ln -s /usr/bin/clang-format-diff-10 /usr/bin/clang-format-diff;\
+    ln -s /usr/bin/lld-10 /usr/bin/lld
diff --git a/containers/buildkite-premerge-debian/start_agent.sh b/containers/buildkite-premerge-debian/start_agent.sh
index 3a0414c..4758acc 100755
--- a/containers/buildkite-premerge-debian/start_agent.sh
+++ b/containers/buildkite-premerge-debian/start_agent.sh
@@ -31,4 +31,6 @@ chmod 700 /var/lib/buildkite-agent/.ssh
 chmod 600 /var/lib/buildkite-agent/.ssh/*
 chown -R $USER:$USER /var/lib/buildkite-agent/.ssh
 
-su buildkite-agent -c "buildkite-agent start"
\ No newline at end of file
+su buildkite-agent -c "buildkite-agent start"
+echo "agent exited"
+sleep 10m
\ No newline at end of file