From 403973a35638c2ae7ee513993fb2fceb6d70910b Mon Sep 17 00:00:00 2001
From: Mikhail Goncharov <goncharov.mikhail@gmail.com>
Date: Wed, 22 Jan 2020 19:04:13 +0100
Subject: [PATCH] Line endings, docs

---
 .../Dockerfile                                | 108 +++++++++---------
 containers/build_deploy.sh                    |   2 +-
 docs/playbooks.md                             |   5 +-
 3 files changed, 60 insertions(+), 55 deletions(-)

diff --git a/containers/agent-debian-testing-clang8-ssd/Dockerfile b/containers/agent-debian-testing-clang8-ssd/Dockerfile
index 4baab8d..a4bf8f5 100644
--- a/containers/agent-debian-testing-clang8-ssd/Dockerfile
+++ b/containers/agent-debian-testing-clang8-ssd/Dockerfile
@@ -1,53 +1,55 @@
-FROM debian:testing
-
-RUN apt-get update ;\
-    apt-get install -y --no-install-recommends locales \
-        cmake ninja-build git ca-certificates clang lld ccache python3 build-essential \
-        clang-tidy clang-format \
-        python3-psutil arcanist zip wget \
-        openjdk-11-jdk \
-        python3-pip python3-setuptools \
-        swig python3-dev libedit-dev libncurses5-dev libxml2-dev liblzma-dev golang rsync jq; \
-        apt-get clean
-
-# Make python3 default (needed by git-clang-format and others).
-RUN rm -f /usr/bin/python && ln -s /usr/bin/python3 /usr/bin/python
-# required for openssh server
-RUN mkdir -p /run/sshd
-
-ARG user=jenkins
-ARG group=jenkins
-ARG uid=1000
-ARG gid=1000
-ARG AGENT_WORKDIR=/home/${user}/agent
-
-RUN mkdir -p /scripts
-
-# install the swarm client
-RUN cd /scripts ;\
-    wget https://repo.jenkins-ci.org/releases/org/jenkins-ci/plugins/swarm-client/3.17/swarm-client-3.17.jar ;\
-    mv swarm-client-3.17.jar swarm-client.jar 
-
-COPY start_agent.sh report_results.sh /scripts/
-
-# install python dependencies for the scripts
-RUN pip3 install -r https://raw.githubusercontent.com/google/llvm-premerge-checks/master/scripts/phabtalk/requirements.txt
-
-RUN groupadd -g ${gid} ${group} ;\
-    useradd -c "Jenkins user" -d /home/${user} -u ${uid} -g ${gid} -m ${user} ;\
-    mkdir /home/${user}/ccache
-
-RUN chown -R ${user}:${user} /home/${user}
-
-WORKDIR /home/${user}
-ENV CCACHE_PATH=/mnt/disks/ssd0/ccache
-
-# configure locale
-RUN sed --in-place '/en_US.UTF-8/s/^#//' /etc/locale.gen ;\
-    locale-gen
-ENV LANG en_US.UTF-8  
-ENV LANGUAGE en_US:en  
-ENV LC_ALL en_US.UTF-8  
-
-CMD ["/scripts/start_agent.sh"]
-
+FROM debian:testing
+
+RUN apt-get update ;\
+    apt-get install -y --no-install-recommends locales \
+        cmake ninja-build git ca-certificates clang lld ccache python3 build-essential \
+        clang-tidy clang-format \
+        python3-psutil arcanist zip wget \
+        openjdk-11-jdk \
+        python3-pip python3-setuptools \
+        swig python3-dev libedit-dev libncurses5-dev libxml2-dev liblzma-dev golang rsync jq; \
+        apt-get clean
+
+# Make python3 default (needed by git-clang-format and others).
+RUN rm -f /usr/bin/python && ln -s /usr/bin/python3 /usr/bin/python
+# required for openssh server
+RUN mkdir -p /run/sshd
+
+ARG user=jenkins
+ARG group=jenkins
+ARG uid=1000
+ARG gid=1000
+ARG AGENT_WORKDIR=/home/${user}/agent
+
+RUN mkdir -p /scripts
+
+# install the swarm client
+RUN cd /scripts ;\
+    wget https://repo.jenkins-ci.org/releases/org/jenkins-ci/plugins/swarm-client/3.17/swarm-client-3.17.jar ;\
+    mv swarm-client-3.17.jar swarm-client.jar 
+
+COPY start_agent.sh report_results.sh /scripts/
+
+# install python dependencies for the scripts
+# ADD will checks that contentent of a file has changed.
+ADD "https://raw.githubusercontent.com/google/llvm-premerge-checks/master/scripts/phabtalk/requirements.txt" requirements.txt
+RUN pip3 install -r requirements.txt
+
+RUN groupadd -g ${gid} ${group} ;\
+    useradd -c "Jenkins user" -d /home/${user} -u ${uid} -g ${gid} -m ${user} ;\
+    mkdir /home/${user}/ccache
+
+RUN chown -R ${user}:${user} /home/${user}
+
+WORKDIR /home/${user}
+ENV CCACHE_PATH=/mnt/disks/ssd0/ccache
+
+# configure locale
+RUN sed --in-place '/en_US.UTF-8/s/^#//' /etc/locale.gen ;\
+    locale-gen
+ENV LANG en_US.UTF-8  
+ENV LANGUAGE en_US:en  
+ENV LC_ALL en_US.UTF-8  
+
+CMD ["/scripts/start_agent.sh"]
+
diff --git a/containers/build_deploy.sh b/containers/build_deploy.sh
index 299a2b7..93bd09c 100755
--- a/containers/build_deploy.sh
+++ b/containers/build_deploy.sh
@@ -27,4 +27,4 @@ QUALIFIED_NAME="${GCR_HOSTNAME}/${GCP_PROJECT}/${IMAGE_NAME}"
 cd "${DIR}/${IMAGE_NAME}"
 docker build -t ${IMAGE_NAME} .
 docker tag ${IMAGE_NAME} ${QUALIFIED_NAME}
-docker push ${QUALIFIED_NAME} 
\ No newline at end of file
+docker push ${QUALIFIED_NAME}
\ No newline at end of file
diff --git a/docs/playbooks.md b/docs/playbooks.md
index ec94176..bf23b77 100644
--- a/docs/playbooks.md
+++ b/docs/playbooks.md
@@ -6,11 +6,14 @@
 General remarks:
 * GCP does not route any traffic to your services unless the service is "healthy". It might take a few minutes after startup before the services is classified as healthy. Until then you will only see some generic error message.
 
-These are the steps to set up the build server on a clean infrastructure:
+These are the steps to set up the build server on a clean infrastructure:  
 1. Configure the tools on your local machine:
     ```bash
     ./local_setup.sh
     ```
+   If you not running docker under your user, you might need to
+   `sudo gcloud auth login --no-launch-browser && gcloud auth configure-docker`
+   before running other commands under sudo.
 1. Delete the old cluster, if it still exists:
     ```bash
     cd kubernetes/cluster