From a4312ac4c545b9525e7ed2b0a9f84c6be2606ea5 Mon Sep 17 00:00:00 2001
From: Andrea Cavalli <andrea@cavallium.it>
Date: Sun, 4 Oct 2020 18:21:48 +0200
Subject: [PATCH] Update Jenkinsfile and dockerfile

---
 Jenkinsfile               |  4 ++--
 jenkins/docker/dockerfile | 27 +++++++++++++++++----------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 8d2d245..c22d2d3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -25,8 +25,8 @@ pipeline {
 				dockerfile {
 					dir 'jenkins/docker'
 					filename 'dockerfile'
-					additionalBuildArgs '--build-arg version=1.0.0'
-					args "--user 1000:1000 -v \"${env.WORKSPACE}/tdlight-java/src/main:/output\" -v \"$HOME:/var/maven\" -v \"$HOME/.ccache:/ccache\" -v \"${env.WORKSPACE}:/work\""
+					additionalBuildArgs '--build-arg version=1.0.0 --build-arg UID=$(id -u) --build-arg GID=$(id -g) --build-arg UNAME=jenkins'
+					args "-v \"${env.WORKSPACE}/tdlight-java/src/main:/home/jenkins/output\" -v \"$HOME/.m2:/home/jenkins/.m2\" -v \"$HOME/.ccache:/home/jenkins/.ccache\" -v \"${env.WORKSPACE}:/home/jenkins/work\""
 					reuseNode false
 				}
 			}
diff --git a/jenkins/docker/dockerfile b/jenkins/docker/dockerfile
index 1c08ef3..bd736d0 100644
--- a/jenkins/docker/dockerfile
+++ b/jenkins/docker/dockerfile
@@ -26,13 +26,24 @@ RUN apt-get install python3 -y
 
 RUN apt-get install libreadline-dev git -y
 
-RUN mkdir /work
+#RUN ./build.sh
 
-RUN mkdir /output
+#ENTRYPOINT [ "/bin/bash" ]
 
-WORKDIR /work
+ARG UNAME=debian
+ARG UID=1000
+ARG GID=1000
+RUN groupadd -g $GID -o $UNAME
+RUN useradd -m -u $UID -g $GID -o -s /bin/bash $UNAME
+USER $UNAME
 
-ENV CCACHE_DIR=/ccache
+RUN mkdir /home/$UNAME/work
+
+RUN mkdir /home/$UNAME/output
+
+WORKDIR /home/$UNAME/work
+
+ENV CCACHE_DIR=/home/$UNAME/.ccache
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-15-amd64
 
@@ -42,12 +53,8 @@ ENV TRAVIS_CPU_ARCH=amd64
 
 ENV TRAVIS_OS_NAME=linux
 
-ENV TRAVIS_BUILD_DIR=/work/tdlight-java
+ENV TRAVIS_BUILD_DIR=/home/$UNAME/work/tdlight-java
 
-ENV TRAVIS_OUTPUT_DIR=/output
-
-#RUN ./build.sh
-
-#ENTRYPOINT [ "/bin/bash" ]
+ENV TRAVIS_OUTPUT_DIR=/home/$UNAME/output
 
 CMD ["bash"]