From 2d89aee0985d99b49251714e03a98c9df57be428 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sun, 4 Oct 2020 17:13:36 +0200 Subject: [PATCH] Update Jenkinsfile and dockerfile --- Jenkinsfile | 2 +- jenkins/docker/dockerfile | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d1d19ef..c701674 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -26,7 +26,7 @@ pipeline { dir 'jenkins/docker' filename 'dockerfile' additionalBuildArgs '--build-arg version=1.0.0' - args "-v \"${env.WORKSPACE}/tdlight-java/src/main:/output\" -v \"$HOME:/var/maven\" -v \"${env.WORKSPACE}/.ccache:/ccache\" -v \"${env.WORKSPACE}:/work\"" + args "-v \"${env.WORKSPACE}/tdlight-java/src/main:/output\" -v \"$HOME:/var/maven\" -v \"${env.WORKSPACE}:/work\"" reuseNode false } } diff --git a/jenkins/docker/dockerfile b/jenkins/docker/dockerfile index 41ffc05..51f7935 100644 --- a/jenkins/docker/dockerfile +++ b/jenkins/docker/dockerfile @@ -30,11 +30,9 @@ RUN mkdir /work RUN mkdir /output -RUN mkdir /ccache - WORKDIR /work -ENV CCACHE_DIR=/ccache +ENV CCACHE_DIR=/work/ccache ENV JAVA_HOME=/usr/lib/jvm/zulu-15-amd64