diff --git a/containers/agent-debian-testing-clang8-ssd/Dockerfile b/containers/agent-debian-testing-clang8-ssd/Dockerfile index 6d56e8a..a68a7e8 100644 --- a/containers/agent-debian-testing-clang8-ssd/Dockerfile +++ b/containers/agent-debian-testing-clang8-ssd/Dockerfile @@ -18,6 +18,12 @@ 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/ # TODO(kuhnel): move ccache to SDD @@ -25,17 +31,10 @@ RUN groupadd -g ${gid} ${group} ;\ useradd -c "Jenkins user" -d /home/${user} -u ${uid} -g ${gid} -m ${user} ;\ mkdir /home/${user}/ccache -COPY authorized_keys /home/${user}/.ssh/ - -RUN chown -R ${user}:${user} /home/${user} ;\ - chmod 700 /home/${user}/.ssh +RUN chown -R ${user}:${user} /home/${user} WORKDIR /home/${user} ENV CCACHE_PATH=/mnt/disks/ssd0/ccache -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 - CMD ["/scripts/start_agent.sh"] diff --git a/containers/agent-debian-testing-clang8-ssd/authorized_keys b/containers/agent-debian-testing-clang8-ssd/authorized_keys deleted file mode 100644 index fd23d06..0000000 --- a/containers/agent-debian-testing-clang8-ssd/authorized_keys +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwYAn/XBFxk1uBhgYCuNLLpriM88dIa22nZdXjzdW7TjGMM2PbJQEPRvGRJjFkgxcRZgND6+oGD8ldMacI7TF5m+TF4TXEp7PKbjeP0vqWx1d/xn2QxDHItWNLXfV9F96TNCMIHjcV9iHZ9u4ciudw51NmsT7oVDsyy+lB9+/I7RbOTzCsDMQQcBdHTCXBqGSo7UtxkQ3qgsWPYDpQpBa8lSIUBhCnsG+hnjk1IHYu9XFqo5jzeUR4DzAuUqzZuxAb/dYWkPjpFlH8RSPpvxRGl3xXeH0VQ9yrlm8zqfTCmXSv14zRpGTrfQFrXXnJTKcQ4+5ACeXOnTKiiWhjlYT3 user@machine