From b3e11ebd386f5486120b1d04654f6559840286e3 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Wed, 29 Apr 2020 00:36:46 +0300 Subject: [PATCH] Updated compose syntax --- docker-compose_v3_alpine_mysql_latest.yaml | 5 ++++- docker-compose_v3_alpine_mysql_local.yaml | 5 ++++- docker-compose_v3_alpine_pgsql_latest.yaml | 5 ++++- docker-compose_v3_alpine_pgsql_local.yaml | 5 ++++- docker-compose_v3_centos_mysql_latest.yaml | 5 ++++- docker-compose_v3_centos_mysql_local.yaml | 5 ++++- docker-compose_v3_centos_pgsql_latest.yaml | 5 ++++- docker-compose_v3_centos_pgsql_local.yaml | 5 ++++- docker-compose_v3_ubuntu_mysql_latest.yaml | 5 ++++- docker-compose_v3_ubuntu_mysql_local.yaml | 5 ++++- docker-compose_v3_ubuntu_pgsql_latest.yaml | 5 ++++- docker-compose_v3_ubuntu_pgsql_local.yaml | 5 ++++- 12 files changed, 48 insertions(+), 12 deletions(-) diff --git a/docker-compose_v3_alpine_mysql_latest.yaml b/docker-compose_v3_alpine_mysql_latest.yaml index e68838601..1461aab2c 100644 --- a/docker-compose_v3_alpine_mysql_latest.yaml +++ b/docker-compose_v3_alpine_mysql_latest.yaml @@ -365,7 +365,10 @@ services: mysql-server: image: mysql:5.7 - command: [mysqld, --character-set-server=utf8, --collation-server=utf8_bin] + command: + - mysqld + - --character-set-server=utf8 + - --collation-server=utf8_bin volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml index b0088ff3a..b4222a9f9 100644 --- a/docker-compose_v3_alpine_mysql_local.yaml +++ b/docker-compose_v3_alpine_mysql_local.yaml @@ -397,7 +397,10 @@ services: mysql-server: image: mysql:5.7 - command: [mysqld, --character-set-server=utf8, --collation-server=utf8_bin] + command: + - mysqld + - --character-set-server=utf8 + - --collation-server=utf8_bin volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: diff --git a/docker-compose_v3_alpine_pgsql_latest.yaml b/docker-compose_v3_alpine_pgsql_latest.yaml index 4343b6dc6..5a2d1ff93 100644 --- a/docker-compose_v3_alpine_pgsql_latest.yaml +++ b/docker-compose_v3_alpine_pgsql_latest.yaml @@ -368,7 +368,10 @@ services: mysql-server: image: mysql:5.7 - command: [mysqld, --character-set-server=utf8, --collation-server=utf8_bin] + command: + - mysqld + - --character-set-server=utf8 + - --collation-server=utf8_bin volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: diff --git a/docker-compose_v3_alpine_pgsql_local.yaml b/docker-compose_v3_alpine_pgsql_local.yaml index c7ad752ed..ee283ec93 100644 --- a/docker-compose_v3_alpine_pgsql_local.yaml +++ b/docker-compose_v3_alpine_pgsql_local.yaml @@ -401,7 +401,10 @@ services: mysql-server: image: mysql:5.7 - command: [mysqld, --character-set-server=utf8, --collation-server=utf8_bin] + command: + - mysqld + - --character-set-server=utf8 + - --collation-server=utf8_bin volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: diff --git a/docker-compose_v3_centos_mysql_latest.yaml b/docker-compose_v3_centos_mysql_latest.yaml index 65d776ba8..5896b1789 100644 --- a/docker-compose_v3_centos_mysql_latest.yaml +++ b/docker-compose_v3_centos_mysql_latest.yaml @@ -365,7 +365,10 @@ services: mysql-server: image: mysql:5.7 - command: [mysqld, --character-set-server=utf8, --collation-server=utf8_bin] + command: + - mysqld + - --character-set-server=utf8 + - --collation-server=utf8_bin volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: diff --git a/docker-compose_v3_centos_mysql_local.yaml b/docker-compose_v3_centos_mysql_local.yaml index 7565c31b4..d24981a0e 100644 --- a/docker-compose_v3_centos_mysql_local.yaml +++ b/docker-compose_v3_centos_mysql_local.yaml @@ -397,7 +397,10 @@ services: mysql-server: image: mysql:5.7 - command: [mysqld, --character-set-server=utf8, --collation-server=utf8_bin] + command: + - mysqld + - --character-set-server=utf8 + - --collation-server=utf8_bin volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: diff --git a/docker-compose_v3_centos_pgsql_latest.yaml b/docker-compose_v3_centos_pgsql_latest.yaml index 5bde0a70a..42b3c5e74 100644 --- a/docker-compose_v3_centos_pgsql_latest.yaml +++ b/docker-compose_v3_centos_pgsql_latest.yaml @@ -368,7 +368,10 @@ services: mysql-server: image: mysql:5.7 - command: [mysqld, --character-set-server=utf8, --collation-server=utf8_bin] + command: + - mysqld + - --character-set-server=utf8 + - --collation-server=utf8_bin volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: diff --git a/docker-compose_v3_centos_pgsql_local.yaml b/docker-compose_v3_centos_pgsql_local.yaml index cc400b6b6..5df507028 100644 --- a/docker-compose_v3_centos_pgsql_local.yaml +++ b/docker-compose_v3_centos_pgsql_local.yaml @@ -380,7 +380,10 @@ services: mysql-server: image: mysql:5.7 - command: [mysqld, --character-set-server=utf8, --collation-server=utf8_bin] + command: + - mysqld + - --character-set-server=utf8 + - --collation-server=utf8_bin volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: diff --git a/docker-compose_v3_ubuntu_mysql_latest.yaml b/docker-compose_v3_ubuntu_mysql_latest.yaml index fc8458d0c..03c979cde 100644 --- a/docker-compose_v3_ubuntu_mysql_latest.yaml +++ b/docker-compose_v3_ubuntu_mysql_latest.yaml @@ -359,7 +359,10 @@ services: mysql-server: image: mysql:5.7 - command: [mysqld, --character-set-server=utf8, --collation-server=utf8_bin] + command: + - mysqld + - --character-set-server=utf8 + - --collation-server=utf8_bin volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: diff --git a/docker-compose_v3_ubuntu_mysql_local.yaml b/docker-compose_v3_ubuntu_mysql_local.yaml index 81541c0a2..71ef9ca72 100644 --- a/docker-compose_v3_ubuntu_mysql_local.yaml +++ b/docker-compose_v3_ubuntu_mysql_local.yaml @@ -391,7 +391,10 @@ services: mysql-server: image: mysql:5.7 - command: [mysqld, --character-set-server=utf8, --collation-server=utf8_bin] + command: + - mysqld + - --character-set-server=utf8 + - --collation-server=utf8_bin volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: diff --git a/docker-compose_v3_ubuntu_pgsql_latest.yaml b/docker-compose_v3_ubuntu_pgsql_latest.yaml index 0df34eccb..eedaaef75 100644 --- a/docker-compose_v3_ubuntu_pgsql_latest.yaml +++ b/docker-compose_v3_ubuntu_pgsql_latest.yaml @@ -362,7 +362,10 @@ services: mysql-server: image: mysql:5.7 - command: [mysqld, --character-set-server=utf8, --collation-server=utf8_bin] + command: + - mysqld + - --character-set-server=utf8 + - --collation-server=utf8_bin volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: diff --git a/docker-compose_v3_ubuntu_pgsql_local.yaml b/docker-compose_v3_ubuntu_pgsql_local.yaml index 332ac4860..b722646e7 100644 --- a/docker-compose_v3_ubuntu_pgsql_local.yaml +++ b/docker-compose_v3_ubuntu_pgsql_local.yaml @@ -371,7 +371,10 @@ services: mysql-server: image: mysql:5.7 - command: [mysqld, --character-set-server=utf8, --collation-server=utf8_bin] + command: + - mysqld + - --character-set-server=utf8 + - --collation-server=utf8_bin volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: