CommunEu
/
Passbolt
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

version bump passbolt switched to mariadb. Fixes #103

This commit is contained in:
Diego Lendoiro 2018-04-26 13:08:52 +02:00
parent 06387f8c1b
commit 2e9afc8526
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose-dev.yml
View File

@ -1,7 +1,7 @@
version: '3.4' version: '3.4'
services: services:
db: db:
image: mysql:latest image: mariadb:latest
env_file: env_file:
- env/mysql.env - env/mysql.env
volumes: volumes:

4
docker-compose-pro.yml
View File

@ -1,7 +1,7 @@
version: '3.4' version: '3.4'
services: services:
db: db:
image: mysql:latest image: mariadb:latest
env_file: env_file:
- env/mysql.env - env/mysql.env
volumes: volumes:
@ -10,7 +10,7 @@ services:
- 3306 - 3306
passbolt: passbolt:
image: passbolt/passbolt:2.0.3-pro-debian image: passbolt/passbolt:2.0.4-pro-debian
tty: true tty: true
depends_on: depends_on:
- db - db

4
docker-compose.yml
View File

@ -1,7 +1,7 @@
version: '3.4' version: '3.4'
services: services:
db: db:
image: mysql:latest image: mariadb:latest
env_file: env_file:
- env/mysql.env - env/mysql.env
volumes: volumes:
@ -10,7 +10,7 @@ services:
- 3306 - 3306
passbolt: passbolt:
image: passbolt/passbolt:2.0.3-debian image: passbolt/passbolt:2.0.4-debian
tty: true tty: true
depends_on: depends_on:
- db - db

2
spec/docker_runtime/runtime_spec.rb
View File

@ -16,7 +16,7 @@ describe 'passbolt_api service' do
"mysqladmin ping --silent" "mysqladmin ping --silent"
] ]
}, },
'Image' => 'mysql') 'Image' => 'mariadb')
@mysql.start @mysql.start
while @mysql.json['State']['Health']['Status'] != 'healthy' while @mysql.json['State']['Health']['Status'] != 'healthy'