Fix for CI cleanup

This commit is contained in:
Jamie Curnow 2024-05-21 13:17:09 +10:00
parent ac0074ea86
commit 6d2cf77fb2
No known key found for this signature in database
GPG Key ID: FFBB624C43388E9E
2 changed files with 2 additions and 3 deletions

1
Jenkinsfile vendored
View File

@ -242,7 +242,6 @@ pipeline {
} }
post { post {
always { always {
sh 'docker-compose down --rmi all --remove-orphans --volumes -t 30 || true'
sh './scripts/ci/build-cleanup' sh './scripts/ci/build-cleanup'
echo 'Reverting ownership' echo 'Reverting ownership'
sh 'docker run --rm -v $(pwd):/data jc21/gotools:latest chown -R "$(id -u):$(id -g)" /data' sh 'docker run --rm -v $(pwd):/data jc21/gotools:latest chown -R "$(id -u):$(id -g)" /data'

View File

@ -3,7 +3,7 @@
DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
. "$DIR/../.common.sh" . "$DIR/../.common.sh"
# Ensure docker-compose exists # Ensure docker exists
if hash docker 2>/dev/null; then if hash docker 2>/dev/null; then
cd "${DIR}/../.." cd "${DIR}/../.."
echo -e "${BLUE} ${CYAN}Build Cleanup ...${RESET}" echo -e "${BLUE} ${CYAN}Build Cleanup ...${RESET}"
@ -11,7 +11,7 @@ if hash docker 2>/dev/null; then
docker run --rm -e CI=true -v "$(pwd):/app" -w /app jc21/gotools:latest rm -rf \ docker run --rm -e CI=true -v "$(pwd):/app" -w /app jc21/gotools:latest rm -rf \
/app/frontend/node_modules \ /app/frontend/node_modules \
/app/docs/node_modules \ /app/docs/node_modules \
/app/docs/.vuepress/dist /app/docs/dist
echo -e "${BLUE} ${GREEN}Build Cleanup Complete${RESET}" echo -e "${BLUE} ${GREEN}Build Cleanup Complete${RESET}"
else else