Skip to content

Commit 91cf3c8

Browse files
committed
Tweaks to docker compose ci after updates
1 parent 7f5e041 commit 91cf3c8

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Jenkinsfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@ pipeline {
9090
steps {
9191
// Bring up a stack
9292
sh 'docker-compose up -d fullstack-sqlite'
93-
sh './scripts/wait-healthy $(docker-compose ps -q fullstack-sqlite) 120'
93+
sh './scripts/wait-healthy $(docker-compose ps --all -q fullstack-sqlite) 120'
9494

9595
// Run tests
9696
sh 'rm -rf test/results'
9797
sh 'docker-compose up cypress-sqlite'
9898
// Get results
99-
sh 'docker cp -L "$(docker-compose ps -q cypress-sqlite):/test/results" test/'
99+
sh 'docker cp -L "$(docker-compose ps --all -q cypress-sqlite):/test/results" test/'
100100
}
101101
post {
102102
always {
@@ -116,13 +116,13 @@ pipeline {
116116
steps {
117117
// Bring up a stack
118118
sh 'docker-compose up -d fullstack-mysql'
119-
sh './scripts/wait-healthy $(docker-compose ps -q fullstack-mysql) 120'
119+
sh './scripts/wait-healthy $(docker-compose ps --all -q fullstack-mysql) 120'
120120

121121
// Run tests
122122
sh 'rm -rf test/results'
123123
sh 'docker-compose up cypress-mysql'
124124
// Get results
125-
sh 'docker cp -L "$(docker-compose ps -q cypress-mysql):/test/results" test/'
125+
sh 'docker cp -L "$(docker-compose ps --all -q cypress-mysql):/test/results" test/'
126126
}
127127
post {
128128
always {

0 commit comments

Comments
 (0)