diff --git a/README.md b/README.md new file mode 100644 index 0000000..25e76c4 --- /dev/null +++ b/README.md @@ -0,0 +1,8 @@ +# jekins slaves + +## build + +``` +docker build --pull=true -t pgollor/jenkins-slave ./docker/main/ +docker build --pull=true -t pgollor/jenkins-slave-arduino ./docker/arduino/ +``` diff --git a/docker-compose.yml b/docker-compose.yml index 7bae31f..97592aa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,7 @@ environment: - JENKINS_SLAVE_SSH_PUBKEY=${JENKINS_SLAVE_SSH_PUBKEY} volumes: - - ./data/slave1:/home/jenkins/ + - ./data/slave1/:/home/jenkins/ tmpfs: - /tmp:rw - /run:rw,size=64m @@ -23,7 +23,7 @@ environment: - JENKINS_SLAVE_SSH_PUBKEY=${JENKINS_SLAVE_SSH_PUBKEY} volumes: - - ./data/slave2:/home/jenkins/ + - ./data/slave2/:/home/jenkins/ tmpfs: - /tmp:rw - /run:rw,size=64m diff --git a/docker/arduino/Dockerfile b/docker/arduino/Dockerfile index 2fb66df..6bb8d72 100644 --- a/docker/arduino/Dockerfile +++ b/docker/arduino/Dockerfile @@ -1,10 +1,20 @@ FROM pgollor/jenkins-slave LABEL MAINTAINER="Pascal Gollor " +# install new ssh key +RUN rm /etc/ssh/ssh_host_rsa_key* /etc/ssh/ssh_host_dsa_key* +RUN ssh-keygen -f /etc/ssh/ssh_host_rsa_key -N '' -t rsa +RUN ssh-keygen -f /etc/ssh/ssh_host_dsa_key -N '' -t dsa + # install arduino RUN ( \ wget -O arduino.tar.xz https://www.arduino.cc/download.php?f=/arduino-nightly-linux64.tar.xz \ - && tar xf arduino.tar.xz \ - && mv arduino-nightly arduino \ - && export PATH="$PWD/arduino:$PATH" \ - ) + && tar -xC /srv -f arduino.tar.xz \ + && rm arduino.tar.xz) +RUN mv /srv/arduino-nightly /srv/arduino +RUN ln -s /srv/arduino/arduino /usr/local/bin +RUN ln -s /srv/arduino/arduino-builder /usr/local/bin + +ENV ARDUINO /srv/arduino + +ENTRYPOINT ["setup-sshd"] diff --git a/docker/main/Dockerfile b/docker/main/Dockerfile index 5bbd2cf..39199f5 100644 --- a/docker/main/Dockerfile +++ b/docker/main/Dockerfile @@ -5,3 +5,10 @@ RUN apt-get -y update \ && apt-get -y upgrade \ && rm -rf /var/lib/apt/lists/* + +# install new ssh key +RUN rm /etc/ssh/ssh_host_rsa_key* /etc/ssh/ssh_host_dsa_key* +RUN ssh-keygen -f /etc/ssh/ssh_host_rsa_key -N '' -t rsa +RUN ssh-keygen -f /etc/ssh/ssh_host_dsa_key -N '' -t dsa + +ENTRYPOINT ["setup-sshd"]