From 6d2cf77fb2e7a52afd4da130bc07ce2809d51860 Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Tue, 21 May 2024 13:17:09 +1000 Subject: [PATCH] Fix for CI cleanup --- Jenkinsfile | 1 - scripts/ci/build-cleanup | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 66d1b439..d1171620 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -242,7 +242,6 @@ pipeline { } post { always { - sh 'docker-compose down --rmi all --remove-orphans --volumes -t 30 || true' sh './scripts/ci/build-cleanup' echo 'Reverting ownership' sh 'docker run --rm -v $(pwd):/data jc21/gotools:latest chown -R "$(id -u):$(id -g)" /data' diff --git a/scripts/ci/build-cleanup b/scripts/ci/build-cleanup index bd8b4089..2c0c75df 100755 --- a/scripts/ci/build-cleanup +++ b/scripts/ci/build-cleanup @@ -3,7 +3,7 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" . "$DIR/../.common.sh" -# Ensure docker-compose exists +# Ensure docker exists if hash docker 2>/dev/null; then cd "${DIR}/../.." 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 \ /app/frontend/node_modules \ /app/docs/node_modules \ - /app/docs/.vuepress/dist + /app/docs/dist echo -e "${BLUE}❯ ${GREEN}Build Cleanup Complete${RESET}" else