|
|
@@ -10,11 +10,11 @@ node{
|
|
|
stage('Build Container')
|
|
|
{
|
|
|
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', '--no-cache -f build/docker/mysql/Dockerfile .')
|
|
|
containerMysql=imageSql.run('--name server-mysql')
|
|
|
containerApache=imageApache.run('-p 1800:1800 --link server-mysql:mysql')
|
|
|
}
|
|
|
- stage('Waiting Container'){
|
|
|
+ /* stage('Waiting Container'){
|
|
|
waitUntil{
|
|
|
try{
|
|
|
sh "docker exec ${containerApache.id} php -v"
|
|
|
@@ -23,7 +23,7 @@ node{
|
|
|
return false
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
+ } */
|
|
|
stage('stage 1bis'){
|
|
|
sh 'docker -v'
|
|
|
sh 'docker ps'
|
