|
@@ -4,7 +4,7 @@ node{
|
|
|
checkout scm
|
|
checkout scm
|
|
|
}
|
|
}
|
|
|
stage('Stop Container'){
|
|
stage('Stop Container'){
|
|
|
- sh 'docker ps | grep "workflow_" -v | awk -F " " \'{if(NR>1)print $1}\' | xargs docker kill | xargs docker rm || true'
|
|
|
|
|
|
|
+ sh 'docker ps | grep "workflow_" -v | awk -F " " \'{if(NR>1)print $1}\' | xargs docker killdo | xargs docker rm || true'
|
|
|
sh 'docker system prune -f'
|
|
sh 'docker system prune -f'
|
|
|
}
|
|
}
|
|
|
stage('Build Container')
|
|
stage('Build Container')
|
|
@@ -12,7 +12,7 @@ node{
|
|
|
imageApache=docker.build('server-apache-dev', '--no-cache -f build/docker/apache/Dockerfile .')
|
|
imageApache=docker.build('server-apache-dev', '--no-cache -f build/docker/apache/Dockerfile .')
|
|
|
imageSql=docker.build('server-mysql-dev', '--no-cache -f build/docker/mysql/Dockerfile .')
|
|
imageSql=docker.build('server-mysql-dev', '--no-cache -f build/docker/mysql/Dockerfile .')
|
|
|
containerMysql=imageSql.run('--name server-mysql-dev')
|
|
containerMysql=imageSql.run('--name server-mysql-dev')
|
|
|
- containerApache=imageApache.run('-p 8080:80 --link server-mysql-dev:mysql')
|
|
|
|
|
|
|
+ containerApache=imageApache.run('-p 8080:8090 --link server-mysql-dev:mysql')
|
|
|
}
|
|
}
|
|
|
stage('Waiting Container'){
|
|
stage('Waiting Container'){
|
|
|
waitUntil{
|
|
waitUntil{
|