From fd9aa3a17e86a1f378b5d31e527b6e2addf36f6e Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sun, 4 Oct 2020 18:10:14 +0200 Subject: [PATCH] Update Jenkinsfile and dockerfile --- Jenkinsfile | 2 +- jenkins/docker/dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d5f8cb5..8d2d245 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -26,7 +26,7 @@ pipeline { 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:/work/ccache\"" + args "--user 1000:1000 -v \"${env.WORKSPACE}/tdlight-java/src/main:/output\" -v \"$HOME:/var/maven\" -v \"$HOME/.ccache:/ccache\" -v \"${env.WORKSPACE}:/work\"" reuseNode false } } diff --git a/jenkins/docker/dockerfile b/jenkins/docker/dockerfile index 51f7935..1c08ef3 100644 --- a/jenkins/docker/dockerfile +++ b/jenkins/docker/dockerfile @@ -32,7 +32,7 @@ RUN mkdir /output WORKDIR /work -ENV CCACHE_DIR=/work/ccache +ENV CCACHE_DIR=/ccache ENV JAVA_HOME=/usr/lib/jvm/zulu-15-amd64