Fix multi-process image when not specifying POSTGRES_PORT_5432_TCP_ADDR #1922
Conversation
When `DATABASE_ADAPTER` is set to `postgresql` we do not need to start the internal mysql daemon. The same is true when `DATABASE_ADAPTER` is set to `mysql2` and `DATABASE_HOST` is set. Fixes huginn#1921
| @@ -13,12 +13,12 @@ fi | |||
| # is a mysql or postgresql database linked? | |||
| # requires that the mysql or postgresql containers have exposed | |||
| # port 3306 and 5432 respectively. | |||
| if [ -n "${MYSQL_PORT_3306_TCP_ADDR}" ]; then | |||
| if [[ -n "${MYSQL_PORT_3306_TCP_ADDR}" || ("${DATABASE_ADAPTER}" == "mysql2" && -n "${DATABASE_HOST}") ]]; then | |||
There was a problem hiding this comment.
Ah, I thought you couldn't use || and had to use -o, but I think that's with [, not [[. Bash scripting is insane.
There was a problem hiding this comment.
It is kind of weird, as far as I know [[ supports more expressions but is not POSIX compatible, but since we only use bash anyways we can use it everywhere.
|
Makes sense! At this point I don't feel qualified to review Docker-related changes. I trust you to test it, and/or you can get a review from someone who's more up-to-speed than I am these days. |
|
Thanks, testing it manually is really the only way, there are soo many variables and different configurations. It might be worth to add some kind of automatic test, but until now the pain of manually testing has not been big enough 😛 I am waiting with the merge for a few days to give @ckir another chance to test the image. |
When
DATABASE_ADAPTERis set topostgresqlwe do not need to startthe internal mysql daemon. The same is true when
DATABASE_ADAPTERisset to
mysql2andDATABASE_HOSTis set.Fixes #1921