diff --git a/deploy/staging b/deploy/staging index ec7e7c48731492562e12e9d7127af5db0318f7c8..3cddf6deff23d384ccba1399863b8cd0ca07205f 100644 --- a/deploy/staging +++ b/deploy/staging @@ -30,10 +30,7 @@ pipeline { steps { sleep(time:5,unit:"SECONDS") sh ''' - docker rmi $(docker images | grep 'dawn-gateway-dev') -f || true - docker rmi $(docker images | grep 'dawn-user-dev') -f || true - docker rmi $(docker images | grep 'dawn-gdd-dev') -f || true - docker rmi $(docker images | grep 'crop-progress-tool-dev') -f || true + docker image prune --filter "until=168h" --filter "label!=latest" ''' } } @@ -48,34 +45,13 @@ pipeline { } - stage('build new service images') { + stage('redeploy') { steps { - - git branch: 'staging', - credentialsId: 'tucker-gitlab-login', - url: 'https://gitlab.cs.umd.edu/dawn/go-backend/dawn-gateway' - sh """ - ls - dawn-cli build-image -p . + dawn-cli deploy """ } } - - - - // stage('cleanup old images') { - // steps { - - // // sh """ - - // // docker rmi $(docker images | grep 'dawn-user-dev') - // // docker rmi $(docker images | grep 'dawn-gdd-dev') - // // docker rmi $(docker images | grep 'crop-progress-tool-dev') - // // """ - // } - // } - } } \ No newline at end of file