diff --git a/database/adminer/adminer.yml b/database/adminer/adminer.yml index 3e70ad4..d7ce41a 100644 --- a/database/adminer/adminer.yml +++ b/database/adminer/adminer.yml @@ -1,7 +1,7 @@ services: adminer: restart: unless-stopped - image: docker.io/adminer:${ADMINER_VERSION-5.4.2} + image: docker.io/adminer:${ADMINER_VERSION-5} volumes: - "./database/adminer/plugins/le-phare-pre-login-to-databases.php:/var/www/html/plugins/le-phare-pre-login-to-databases.php:ro" networks: diff --git a/database/adminer/plugins/le-phare-pre-login-to-databases.php b/database/adminer/plugins/le-phare-pre-login-to-databases.php index b8c12d0..9b1ad85 100644 --- a/database/adminer/plugins/le-phare-pre-login-to-databases.php +++ b/database/adminer/plugins/le-phare-pre-login-to-databases.php @@ -5,8 +5,8 @@ */ class LePharePluginPreLoginToDatabases { - const array MYSQL_HOSTS = ['mysql_5', 'mariadb_10']; - const array POSTGRESQL_HOSTS = ['pgsql_9', 'pgsql_10', 'pgsql_11', 'pgsql_12', 'pgsql_13', 'pgsql_14', 'pgsql_15', 'pgsql_16', 'pgsql_17', 'pgsql_18']; + const array MYSQL_HOSTS = ['mysql-5', 'mariadb-10']; + const array POSTGRESQL_HOSTS = ['pgsql-9', 'pgsql-10', 'pgsql-11', 'pgsql-12', 'pgsql-13', 'pgsql-14', 'pgsql-15', 'pgsql-16', 'pgsql-17', 'pgsql-18']; function __construct() { diff --git a/database/mariadb/10.yml b/database/mariadb/10.yml index eb5c681..2ec0094 100644 --- a/database/mariadb/10.yml +++ b/database/mariadb/10.yml @@ -4,6 +4,7 @@ services: image: docker.io/mariadb:10 networks: private: + aliases: [mariadb-10] environment: MYSQL_ROOT_PASSWORD: root volumes: diff --git a/database/mysql/5.yml b/database/mysql/5.yml index 6a04f79..33b6d89 100644 --- a/database/mysql/5.yml +++ b/database/mysql/5.yml @@ -4,6 +4,7 @@ services: image: docker.io/mysql:5-debian networks: private: + aliases: [mysql-5] environment: MYSQL_ROOT_PASSWORD: root volumes: diff --git a/database/postgres/10.yml b/database/postgres/10.yml index 3470932..5583849 100644 --- a/database/postgres/10.yml +++ b/database/postgres/10.yml @@ -4,6 +4,7 @@ services: image: docker.io/postgres:10 networks: private: + aliases: [pgsql-10] volumes: - pgsql_10:/var/lib/postgres/data environment: diff --git a/database/postgres/11.yml b/database/postgres/11.yml index 39004ff..806adbd 100644 --- a/database/postgres/11.yml +++ b/database/postgres/11.yml @@ -4,6 +4,7 @@ services: image: docker.io/postgres:11 networks: private: + aliases: [pgsql-11] volumes: - pgsql_11:/var/lib/postgres/data environment: diff --git a/database/postgres/12.yml b/database/postgres/12.yml index 67dba51..b830161 100644 --- a/database/postgres/12.yml +++ b/database/postgres/12.yml @@ -4,6 +4,7 @@ services: image: docker.io/postgres:12 networks: private: + aliases: [pgsql-12] volumes: - pgsql_12:/var/lib/postgres/data environment: diff --git a/database/postgres/13.yml b/database/postgres/13.yml index aa78d61..e242293 100644 --- a/database/postgres/13.yml +++ b/database/postgres/13.yml @@ -4,6 +4,7 @@ services: image: docker.io/postgres:13 networks: private: + aliases: [pgsql-13] volumes: - pgsql_13:/var/lib/postgres/data environment: diff --git a/database/postgres/14.yml b/database/postgres/14.yml index bcdd7c8..b668d1f 100644 --- a/database/postgres/14.yml +++ b/database/postgres/14.yml @@ -4,6 +4,7 @@ services: image: docker.io/postgres:14 networks: private: + aliases: [pgsql-14] volumes: - pgsql_14:/var/lib/postgres/data environment: diff --git a/database/postgres/15.yml b/database/postgres/15.yml index f82012b..4ac414b 100644 --- a/database/postgres/15.yml +++ b/database/postgres/15.yml @@ -4,6 +4,7 @@ services: image: docker.io/postgres:15 networks: private: + aliases: [pgsql-15] volumes: - pgsql_15:/var/lib/postgres/data environment: diff --git a/database/postgres/16.yml b/database/postgres/16.yml index d0cb6e7..6bac6fc 100644 --- a/database/postgres/16.yml +++ b/database/postgres/16.yml @@ -4,6 +4,7 @@ services: image: docker.io/postgres:16 networks: private: + aliases: [pgsql-16] volumes: - pgsql_16:/var/lib/postgres/data environment: diff --git a/database/postgres/17.yml b/database/postgres/17.yml index 9d335db..cb513b2 100644 --- a/database/postgres/17.yml +++ b/database/postgres/17.yml @@ -4,6 +4,7 @@ services: image: docker.io/postgres:17 networks: private: + aliases: [pgsql-17] volumes: - pgsql_17:/var/lib/postgres/data environment: diff --git a/database/postgres/18.yml b/database/postgres/18.yml index 9cc6068..8196006 100644 --- a/database/postgres/18.yml +++ b/database/postgres/18.yml @@ -4,6 +4,7 @@ services: image: docker.io/postgres:18 networks: private: + aliases: [pgsql-18] volumes: - pgsql_18:/var/lib/postgres/data environment: diff --git a/database/postgres/9.yml b/database/postgres/9.yml index 89338ac..375f2d2 100644 --- a/database/postgres/9.yml +++ b/database/postgres/9.yml @@ -4,6 +4,7 @@ services: restart: unless-stopped networks: private: + aliases: [pgsql-9] volumes: - pgsql_9:/var/lib/postgres/data environment: diff --git a/rabbitmq/3_10.yml b/rabbitmq/3_10.yml index c15b28b..fe52413 100644 --- a/rabbitmq/3_10.yml +++ b/rabbitmq/3_10.yml @@ -4,7 +4,8 @@ services: hostname: rabbitmq restart: unless-stopped networks: - - private + private: + aliases: [rabbitmq-3-10] volumes: - rabbitmq_3_10:/var/lib/rabbitmq environment: diff --git a/rabbitmq/3_8.yml b/rabbitmq/3_8.yml index 7ea957d..c82db02 100644 --- a/rabbitmq/3_8.yml +++ b/rabbitmq/3_8.yml @@ -4,7 +4,8 @@ services: hostname: rabbitmq restart: unless-stopped networks: - - private + private: + aliases: [rabbitmq-3-8] volumes: - rabbitmq_3_8:/var/lib/rabbitmq environment: diff --git a/rabbitmq/4.yml b/rabbitmq/4.yml index 751cfbb..b039b9e 100644 --- a/rabbitmq/4.yml +++ b/rabbitmq/4.yml @@ -4,7 +4,8 @@ services: hostname: rabbitmq_4 restart: unless-stopped networks: - - private + private: + aliases: [rabbitmq-4] volumes: - rabbitmq_4:/var/lib/rabbitmq environment: