Skip to content

Commit ea5bdab

Browse files
author
Jamie Curnow
committed
Fix CI permissions, again and again
1 parent 0e96ad6 commit ea5bdab

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

Jenkinsfile

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pipeline {
2727
// Codebase
2828
sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE} yarn install'
2929
sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE} npm run-script build'
30-
sh 'rm -rf node_modules'
30+
sh 'docker run --rm -v $(pwd):/data ${DOCKER_CI_TOOLS} rm -rf node_modules'
3131
sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE} yarn install --prod'
3232
sh 'docker run --rm -v $(pwd):/data ${DOCKER_CI_TOOLS} node-prune'
3333

@@ -58,7 +58,7 @@ pipeline {
5858
// Codebase
5959
sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE} yarn install'
6060
sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE} npm run-script build'
61-
sh 'rm -rf node_modules'
61+
sh 'docker run --rm -v $(pwd):/data ${DOCKER_CI_TOOLS} rm -rf node_modules'
6262
sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE} yarn install --prod'
6363
sh 'docker run --rm -v $(pwd):/data ${DOCKER_CI_TOOLS} node-prune'
6464

@@ -93,7 +93,7 @@ pipeline {
9393
// Codebase
9494
sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE} yarn install'
9595
sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE} npm run-script build'
96-
sh 'rm -rf node_modules'
96+
sh 'docker run --rm -v $(pwd):/data ${DOCKER_CI_TOOLS} rm -rf node_modules'
9797
sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE} yarn install --prod'
9898
sh 'docker run --rm -v $(pwd):/data ${DOCKER_CI_TOOLS} node-prune'
9999

@@ -128,7 +128,7 @@ pipeline {
128128
// Codebase
129129
sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE} yarn install'
130130
sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE} npm run-script build'
131-
sh 'sudo rm -rf node_modules'
131+
sh 'docker run --rm -v $(pwd):/data ${DOCKER_CI_TOOLS} rm -rf node_modules'
132132
sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE} yarn install --prod'
133133

134134
// Docker Build
@@ -162,7 +162,7 @@ pipeline {
162162
// Codebase
163163
sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE} yarn install'
164164
sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE} npm run-script build'
165-
sh 'rm -rf node_modules'
165+
sh 'docker run --rm -v $(pwd):/data ${DOCKER_CI_TOOLS} rm -rf node_modules'
166166
sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE} yarn install --prod'
167167

168168
// Docker Build
@@ -197,7 +197,7 @@ pipeline {
197197
// Codebase
198198
sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE} yarn install'
199199
sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE} npm run-script build'
200-
sh 'rm -rf node_modules'
200+
sh 'docker run --rm -v $(pwd):/data ${DOCKER_CI_TOOLS} rm -rf node_modules'
201201
sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE} yarn install --prod'
202202
203203
// Docker Build
@@ -352,9 +352,8 @@ pipeline {
352352
sh 'figlet "FAILURE"'
353353
}
354354
always {
355-
// Revert ownership
356355
sh 'echo Reverting ownership'
357-
sh 'docker run --rm -v $(pwd):/project ${DOCKER_CI_TOOLS} chown -R $(id -u):$(id -g) /project'
356+
sh 'docker run --rm -v $(pwd):/data ${DOCKER_CI_TOOLS} chown -R $(id -u):$(id -g) /data'
358357
}
359358
}
360359
}

0 commit comments

Comments
 (0)