diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2017-02-24 15:37:43 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2017-02-24 15:37:43 +0000 |
| commit | 70a86f52644e0143ac2ba4269eeefd6c74452c08 (patch) | |
| tree | 45e9c902bd66baa1d87f109fbaa1a294a7acafaa /trusty-i386-tcwg-base | |
| parent | b503f7bdbbbe1e0645626748e6394e2ede8fd087 (diff) | |
*-tcwg-base: Remove customization from "tcwg-build" images.
Change-Id: I69ddee9c8c15c8a93cf1699e16f40de9a0280cfe
Diffstat (limited to 'trusty-i386-tcwg-base')
| -rw-r--r-- | trusty-i386-tcwg-base/Dockerfile | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/trusty-i386-tcwg-base/Dockerfile b/trusty-i386-tcwg-base/Dockerfile index 8a9bea6b..e1f133d1 100644 --- a/trusty-i386-tcwg-base/Dockerfile +++ b/trusty-i386-tcwg-base/Dockerfile @@ -1,7 +1,5 @@ FROM linaro/base-i386-ubuntu:trusty -COPY tcwg-buildslave/.ssh /etc/skel/.ssh - RUN echo 'deb http://archive.ubuntu.com/ubuntu trusty main universe' > /etc/apt/sources.list \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y \ @@ -69,35 +67,14 @@ RUN echo 'deb http://archive.ubuntu.com/ubuntu trusty main universe' > /etc/apt/ /tmp/* \ /var/tmp/* -RUN chmod 0700 /etc/skel/.ssh \ - && groupadd -g 9000 tcwg-infra \ - && useradd -m -g tcwg-infra -u 11827 tcwg-buildslave \ - && rm -rf /etc/skel/.ssh \ - && echo 'tcwg-buildslave ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \ - && chmod 440 /etc/sudoers.d/jenkins \ - && install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr/local/bin/git-new-workdir \ +RUN install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr/local/bin/git-new-workdir \ && sed -i -e 's:^session *required *pam_loginuid.so:# session required pam_loginuid.so:' /etc/pam.d/sshd \ && mkdir -p /var/run/sshd \ && sed -i \ -e "/.*MaxStartups.*/d" \ -e "/.*MaxSesssions.*/d" \ && echo "MaxStartups 256" >> /etc/ssh/sshd_config \ - && echo "MaxSessions 256" >> /etc/ssh/sshd_config \ - && mkdir -p /home/tcwg-buildslave/workspace \ - && chown tcwg-buildslave:tcwg-infra /home/tcwg-buildslave/workspace - -# Unfortunately, VOLUME doesn't support bind-mounts for portability reasons. -# Therefore, the bind-mounts for the following paths are configured in -# the ci.linaro.org's docker plugin. -# Sources caches (read-only): -# /home/tcwg-buildslave/snapshots-ref:/home/tcwg-buildslave/snapshots-ref:ro -# Jenkins .jar cache (read-write): -# /home/tcwg-buildslave/.jenkins:/home/tcwg-buildslave/.jenkins:rw - -# We write most of the data inside workspace, so make it a scratch mount. -# Note that bind-mounting workspace from host will make jobs with parallel -# builds fail. -VOLUME /home/tcwg-buildslave/workspace + && echo "MaxSessions 256" >> /etc/ssh/sshd_config # We use ssh multiplexing, which creates sockets in /tmp. Overlayfs, # which docker is using can't host sockets, so we use a scratch mount |