From 0bfe578810ff0a7cafa31bcd956a421f353aa2f4 Mon Sep 17 00:00:00 2001
From: Luke Anderson <luke@lukeanderson.com.au>
Date: Tue, 7 May 2019 14:00:15 +1000
Subject: [PATCH] Updated Jenkins configuration to use , to be consistent with
 the GitLab caching mechanism.

---
 Dockerfile  | 4 ++--
 Jenkinsfile | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6691efa97..e693c91a3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,8 +14,8 @@ RUN git clone https://github.com/google/protobuf.git && \
     rm -r protobuf
 
 
-RUN mkdir /cargocache && chmod -R ugo+rwX /cargocache
+RUN mkdir -p /cache/cargocache && chmod -R ugo+rwX /cache/cargocache
 
-ENV CARGO_HOME /cargocache
+ENV CARGO_HOME /cache/cargocache
 
 RUN rustup component add rustfmt clippy
diff --git a/Jenkinsfile b/Jenkinsfile
index 11cbf0abe..3b022551e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2,7 +2,7 @@ pipeline {
 	agent {
 		dockerfile {
 			filename 'Dockerfile'
-			args '-v cargo-cache:/cargocache:rw -e "CARGO_HOME=/cargocache"'
+			args '-v cargo-cache:/cache/cargocache:rw -e "CARGO_HOME=/cache/cargocache"'
 		}
 	}
 	stages {