diff --git a/DINDAgent/Dockerfile b/DINDAgent/Dockerfile index 97e9de4..509fdb5 100644 --- a/DINDAgent/Dockerfile +++ b/DINDAgent/Dockerfile @@ -3,6 +3,7 @@ FROM git.zontreck.com/ariascreations/buildenvironments:debianbuild ENV DOCKER_AGENT_SECRET NAN ENV DOCKER_USER NAN ENV DOCKER_PASSWORD NAN +ENV HOME /home/builder RUN apt-get update && apt-get upgrade -y @@ -16,4 +17,8 @@ WORKDIR / RUN curl -sO https://ci.zontreck.com/jnlpJars/agent.jar +RUN useradd -m -s /bin/bash builder +USER builder + + ENTRYPOINT ["/bin/bash", "/entrypoint.sh"] \ No newline at end of file diff --git a/DINDAgent/entrypoint.sh b/DINDAgent/entrypoint.sh index 66f3726..8fd2fa0 100644 --- a/DINDAgent/entrypoint.sh +++ b/DINDAgent/entrypoint.sh @@ -1,5 +1,11 @@ #!/bin/bash +mkdir -pv /home/builder/.ssh +cp -v /keys/id_rsa ~/.ssh/ +cp -v /keys/id_rsa.pub ~/.ssh/ + +chmod 0600 ~/.ssh/id_rsa + docker login git.zontreck.com -u "$DOCKER_USER" -p "$DOCKER_PASSWORD" java -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -jar /agent.jar -url "https://ci.zontreck.com" -secret "$DOCKER_AGENT_SECRET" -name "BuilderHost" -workDir "/builder"