spec: Make sure to use the proper docker-compose for cleanup

refs COREFE-286

Change-Id: I0f1b399621a200efe69e8d37c553290e1e172949
Reviewed-on: https://gerrit.instructure.com/208904
Tested-by: Jenkins
QA-Review: Clay Diffrient <cdiffrient@instructure.com>
Product-Review: Clay Diffrient <cdiffrient@instructure.com>
Reviewed-by: James Butters <jbutters@instructure.com>
This commit is contained in:
Clay Diffrient 2019-09-10 15:26:47 -06:00
parent b6c96b76e9
commit 66d1073b48
2 changed files with 8 additions and 2 deletions

View File

@ -28,7 +28,13 @@ def setDockerUp () {
}
def cleanupDocker () {
sh 'build/new-jenkins/docker-cleanup.sh'
withEnv(['COMPOSE_FILE=docker-compose.new-jenkins-web.yml:docker-compose.new-jenkins-karma.yml']) {
// Make sure to clean up the karma containers and image
sh 'docker-compose rm -fs karma'
sh 'docker rmi frontend_karma'
// Clean up all the other stuff
sh 'build/new-jenkins/docker-cleanup.sh'
}
}
def isMerge () {

View File

@ -4,7 +4,7 @@ docker-compose stop && docker-compose down --volumes --remove-orphans --rmi all
docker-compose stop && docker-compose down --volumes --remove-orphans --rmi all
echo "running docker images"
docker ps
docker ps -a
echo "images locally"
docker images
echo "volumes left over"