From a4eb4f2a1d950a15f6cbfec7a29f10c48530a818 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Thu, 28 Sep 2023 14:10:25 +0900 Subject: [PATCH] Updated MySQL startup options and updated PostgreSQL version from 14 to 16 --- docker-compose_v3_alpine_mysql_latest.yaml | 5 +++-- docker-compose_v3_alpine_mysql_local.yaml | 5 +++-- docker-compose_v3_alpine_pgsql_latest.yaml | 6 +++--- docker-compose_v3_alpine_pgsql_local.yaml | 6 +++--- docker-compose_v3_centos_mysql_latest.yaml | 4 +++- docker-compose_v3_centos_mysql_local.yaml | 4 +++- docker-compose_v3_centos_pgsql_latest.yaml | 5 +++-- docker-compose_v3_centos_pgsql_local.yaml | 5 +++-- docker-compose_v3_ol_mysql_latest.yaml | 4 +++- docker-compose_v3_ol_mysql_local.yaml | 4 +++- docker-compose_v3_ol_pgsql_latest.yaml | 5 +++-- docker-compose_v3_ol_pgsql_local.yaml | 5 +++-- docker-compose_v3_ubuntu_mysql_latest.yaml | 4 +++- docker-compose_v3_ubuntu_mysql_local.yaml | 4 +++- docker-compose_v3_ubuntu_pgsql_latest.yaml | 5 +++-- docker-compose_v3_ubuntu_pgsql_local.yaml | 5 +++-- 16 files changed, 48 insertions(+), 28 deletions(-) diff --git a/docker-compose_v3_alpine_mysql_latest.yaml b/docker-compose_v3_alpine_mysql_latest.yaml index 01a0a17b9..694bfda46 100644 --- a/docker-compose_v3_alpine_mysql_latest.yaml +++ b/docker-compose_v3_alpine_mysql_latest.yaml @@ -428,8 +428,9 @@ services: - mysqld - --character-set-server=utf8mb4 - --collation-server=utf8mb4_bin - - --skip-character-set-client-handshake - - --default-authentication-plugin=mysql_native_password +# Only during upgrade from versions prior 6.4 +# - --log_bin_trust_function_creators=1 +# Use TLS encryption for connections to database # - --require-secure-transport # - --ssl-ca=/run/secrets/root-ca.pem # - --ssl-cert=/run/secrets/server-cert.pem diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml index 4cbfab3f8..f4d6772b8 100644 --- a/docker-compose_v3_alpine_mysql_local.yaml +++ b/docker-compose_v3_alpine_mysql_local.yaml @@ -521,8 +521,9 @@ services: - mysqld - --character-set-server=utf8mb4 - --collation-server=utf8mb4_bin - - --skip-character-set-client-handshake - - --default-authentication-plugin=mysql_native_password +# Only during upgrade from versions prior 6.4 +# - --log_bin_trust_function_creators=1 +# Use TLS encryption for connections to database # - --require-secure-transport # - --ssl-ca=/run/secrets/root-ca.pem # - --ssl-cert=/run/secrets/server-cert.pem diff --git a/docker-compose_v3_alpine_pgsql_latest.yaml b/docker-compose_v3_alpine_pgsql_latest.yaml index 82a1be865..f277d43a3 100644 --- a/docker-compose_v3_alpine_pgsql_latest.yaml +++ b/docker-compose_v3_alpine_pgsql_latest.yaml @@ -421,8 +421,8 @@ services: - mysqld - --character-set-server=utf8mb4 - --collation-server=utf8mb4_bin - - --skip-character-set-client-handshake - - --default-authentication-plugin=mysql_native_password +# Only during upgrade from versions prior 6.4 +# - --log_bin_trust_function_creators=1 volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: @@ -440,7 +440,7 @@ services: - mysql-database postgres-server: - image: postgres:14-alpine + image: postgres:16-alpine # command: -c ssl=on -c ssl_cert_file=/run/secrets/server-cert.pem -c ssl_key_file=/run/secrets/server-key.pem -c ssl_ca_file=/run/secrets/root-ca.pem volumes: - ./zbx_env/var/lib/postgresql/data:/var/lib/postgresql/data:rw diff --git a/docker-compose_v3_alpine_pgsql_local.yaml b/docker-compose_v3_alpine_pgsql_local.yaml index aae112ca0..8591b17d9 100644 --- a/docker-compose_v3_alpine_pgsql_local.yaml +++ b/docker-compose_v3_alpine_pgsql_local.yaml @@ -528,8 +528,8 @@ services: - mysqld - --character-set-server=utf8mb4 - --collation-server=utf8mb4_bin - - --skip-character-set-client-handshake - - --default-authentication-plugin=mysql_native_password +# Only during upgrade from versions prior 6.4 +# - --log_bin_trust_function_creators=1 volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: @@ -547,7 +547,7 @@ services: - mysql-database postgres-server: - image: postgres:14-alpine + image: postgres:16-alpine # command: -c ssl=on -c ssl_cert_file=/run/secrets/server-cert.pem -c ssl_key_file=/run/secrets/server-key.pem -c ssl_ca_file=/run/secrets/root-ca.pem volumes: - ./zbx_env/var/lib/postgresql/data:/var/lib/postgresql/data:rw diff --git a/docker-compose_v3_centos_mysql_latest.yaml b/docker-compose_v3_centos_mysql_latest.yaml index 95e0d931b..6b01f9664 100644 --- a/docker-compose_v3_centos_mysql_latest.yaml +++ b/docker-compose_v3_centos_mysql_latest.yaml @@ -428,7 +428,9 @@ services: - mysqld - --character-set-server=utf8mb4 - --collation-server=utf8mb4_bin - - --default-authentication-plugin=mysql_native_password +# Only during upgrade from versions prior 6.4 +# - --log_bin_trust_function_creators=1 +# Use TLS encryption for connections to database # - --require-secure-transport # - --ssl-ca=/run/secrets/root-ca.pem # - --ssl-cert=/run/secrets/server-cert.pem diff --git a/docker-compose_v3_centos_mysql_local.yaml b/docker-compose_v3_centos_mysql_local.yaml index ce002709e..921c95b07 100644 --- a/docker-compose_v3_centos_mysql_local.yaml +++ b/docker-compose_v3_centos_mysql_local.yaml @@ -522,7 +522,9 @@ services: - mysqld - --character-set-server=utf8mb4 - --collation-server=utf8mb4_bin - - --default-authentication-plugin=mysql_native_password +# Only during upgrade from versions prior 6.4 +# - --log_bin_trust_function_creators=1 +# Use TLS encryption for connections to database # - --require-secure-transport # - --ssl-ca=/run/secrets/root-ca.pem # - --ssl-cert=/run/secrets/server-cert.pem diff --git a/docker-compose_v3_centos_pgsql_latest.yaml b/docker-compose_v3_centos_pgsql_latest.yaml index 94ad27b7e..25c3dcff5 100644 --- a/docker-compose_v3_centos_pgsql_latest.yaml +++ b/docker-compose_v3_centos_pgsql_latest.yaml @@ -421,7 +421,8 @@ services: - mysqld - --character-set-server=utf8mb4 - --collation-server=utf8mb4_bin - - --default-authentication-plugin=mysql_native_password +# Only during upgrade from versions prior 6.4 +# - --log_bin_trust_function_creators=1 volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: @@ -439,7 +440,7 @@ services: - mysql-database postgres-server: - image: postgres:14-alpine + image: postgres:16-alpine # command: -c ssl=on -c ssl_cert_file=/run/secrets/server-cert.pem -c ssl_key_file=/run/secrets/server-key.pem -c ssl_ca_file=/run/secrets/root-ca.pem volumes: - ./zbx_env/var/lib/postgresql/data:/var/lib/postgresql/data:rw diff --git a/docker-compose_v3_centos_pgsql_local.yaml b/docker-compose_v3_centos_pgsql_local.yaml index 4d09138db..1869717c7 100644 --- a/docker-compose_v3_centos_pgsql_local.yaml +++ b/docker-compose_v3_centos_pgsql_local.yaml @@ -528,7 +528,8 @@ services: - mysqld - --character-set-server=utf8mb4 - --collation-server=utf8mb4_bin - - --default-authentication-plugin=mysql_native_password +# Only during upgrade from versions prior 6.4 +# - --log_bin_trust_function_creators=1 volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: @@ -546,7 +547,7 @@ services: - mysql-database postgres-server: - image: postgres:14-alpine + image: postgres:16-alpine # command: -c ssl=on -c ssl_cert_file=/run/secrets/server-cert.pem -c ssl_key_file=/run/secrets/server-key.pem -c ssl_ca_file=/run/secrets/root-ca.pem volumes: - ./zbx_env/var/lib/postgresql/data:/var/lib/postgresql/data:rw diff --git a/docker-compose_v3_ol_mysql_latest.yaml b/docker-compose_v3_ol_mysql_latest.yaml index f4bfe7f26..c2e408482 100644 --- a/docker-compose_v3_ol_mysql_latest.yaml +++ b/docker-compose_v3_ol_mysql_latest.yaml @@ -428,7 +428,9 @@ services: - mysqld - --character-set-server=utf8mb4 - --collation-server=utf8mb4_bin - - --default-authentication-plugin=mysql_native_password +# Only during upgrade from versions prior 6.4 +# - --log_bin_trust_function_creators=1 +# Use TLS encryption for connections to database # - --require-secure-transport # - --ssl-ca=/run/secrets/root-ca.pem # - --ssl-cert=/run/secrets/server-cert.pem diff --git a/docker-compose_v3_ol_mysql_local.yaml b/docker-compose_v3_ol_mysql_local.yaml index 37cc9da45..ea39f4869 100644 --- a/docker-compose_v3_ol_mysql_local.yaml +++ b/docker-compose_v3_ol_mysql_local.yaml @@ -522,7 +522,9 @@ services: - mysqld - --character-set-server=utf8mb4 - --collation-server=utf8mb4_bin - - --default-authentication-plugin=mysql_native_password +# Only during upgrade from versions prior 6.4 +# - --log_bin_trust_function_creators=1 +# Use TLS encryption for connections to database # - --require-secure-transport # - --ssl-ca=/run/secrets/root-ca.pem # - --ssl-cert=/run/secrets/server-cert.pem diff --git a/docker-compose_v3_ol_pgsql_latest.yaml b/docker-compose_v3_ol_pgsql_latest.yaml index 2a6ba95ed..eedcb1e20 100644 --- a/docker-compose_v3_ol_pgsql_latest.yaml +++ b/docker-compose_v3_ol_pgsql_latest.yaml @@ -421,7 +421,8 @@ services: - mysqld - --character-set-server=utf8mb4 - --collation-server=utf8mb4_bin - - --default-authentication-plugin=mysql_native_password +# Only during upgrade from versions prior 6.4 +# - --log_bin_trust_function_creators=1 volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: @@ -439,7 +440,7 @@ services: - mysql-database postgres-server: - image: postgres:14-alpine + image: postgres:16-alpine # command: -c ssl=on -c ssl_cert_file=/run/secrets/server-cert.pem -c ssl_key_file=/run/secrets/server-key.pem -c ssl_ca_file=/run/secrets/root-ca.pem volumes: - ./zbx_env/var/lib/postgresql/data:/var/lib/postgresql/data:rw diff --git a/docker-compose_v3_ol_pgsql_local.yaml b/docker-compose_v3_ol_pgsql_local.yaml index ee805aab7..1d9a70a87 100644 --- a/docker-compose_v3_ol_pgsql_local.yaml +++ b/docker-compose_v3_ol_pgsql_local.yaml @@ -528,7 +528,8 @@ services: - mysqld - --character-set-server=utf8mb4 - --collation-server=utf8mb4_bin - - --default-authentication-plugin=mysql_native_password +# Only during upgrade from versions prior 6.4 +# - --log_bin_trust_function_creators=1 volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: @@ -546,7 +547,7 @@ services: - mysql-database postgres-server: - image: postgres:14-alpine + image: postgres:16-alpine # command: -c ssl=on -c ssl_cert_file=/run/secrets/server-cert.pem -c ssl_key_file=/run/secrets/server-key.pem -c ssl_ca_file=/run/secrets/root-ca.pem volumes: - ./zbx_env/var/lib/postgresql/data:/var/lib/postgresql/data:rw diff --git a/docker-compose_v3_ubuntu_mysql_latest.yaml b/docker-compose_v3_ubuntu_mysql_latest.yaml index a69600eb6..30f3d61bf 100644 --- a/docker-compose_v3_ubuntu_mysql_latest.yaml +++ b/docker-compose_v3_ubuntu_mysql_latest.yaml @@ -420,7 +420,9 @@ services: - mysqld - --character-set-server=utf8mb4 - --collation-server=utf8mb4_bin - - --default-authentication-plugin=mysql_native_password +# Only during upgrade from versions prior 6.4 +# - --log_bin_trust_function_creators=1 +# Use TLS encryption for connections to database # - --require-secure-transport # - --ssl-ca=/run/secrets/root-ca.pem # - --ssl-cert=/run/secrets/server-cert.pem diff --git a/docker-compose_v3_ubuntu_mysql_local.yaml b/docker-compose_v3_ubuntu_mysql_local.yaml index 9f2a67560..9a339908a 100644 --- a/docker-compose_v3_ubuntu_mysql_local.yaml +++ b/docker-compose_v3_ubuntu_mysql_local.yaml @@ -516,7 +516,9 @@ services: - mysqld - --character-set-server=utf8mb4 - --collation-server=utf8mb4_bin - - --default-authentication-plugin=mysql_native_password +# Only during upgrade from versions prior 6.4 +# - --log_bin_trust_function_creators=1 +# Use TLS encryption for connections to database # - --require-secure-transport # - --ssl-ca=/run/secrets/root-ca.pem # - --ssl-cert=/run/secrets/server-cert.pem diff --git a/docker-compose_v3_ubuntu_pgsql_latest.yaml b/docker-compose_v3_ubuntu_pgsql_latest.yaml index 2d1cdaeed..513ebd9c4 100644 --- a/docker-compose_v3_ubuntu_pgsql_latest.yaml +++ b/docker-compose_v3_ubuntu_pgsql_latest.yaml @@ -415,7 +415,8 @@ services: - mysqld - --character-set-server=utf8mb4 - --collation-server=utf8mb4_bin - - --default-authentication-plugin=mysql_native_password +# Only during upgrade from versions prior 6.4 +# - --log_bin_trust_function_creators=1 volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: @@ -433,7 +434,7 @@ services: - mysql-database postgres-server: - image: postgres:14-alpine + image: postgres:16-alpine # command: -c ssl=on -c ssl_cert_file=/run/secrets/server-cert.pem -c ssl_key_file=/run/secrets/server-key.pem -c ssl_ca_file=/run/secrets/root-ca.pem volumes: - ./zbx_env/var/lib/postgresql/data:/var/lib/postgresql/data:rw diff --git a/docker-compose_v3_ubuntu_pgsql_local.yaml b/docker-compose_v3_ubuntu_pgsql_local.yaml index 496bda701..1193052a2 100644 --- a/docker-compose_v3_ubuntu_pgsql_local.yaml +++ b/docker-compose_v3_ubuntu_pgsql_local.yaml @@ -522,7 +522,8 @@ services: - mysqld - --character-set-server=utf8mb4 - --collation-server=utf8mb4_bin - - --default-authentication-plugin=mysql_native_password +# Only during upgrade from versions prior 6.4 +# - --log_bin_trust_function_creators=1 volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: @@ -540,7 +541,7 @@ services: - mysql-database postgres-server: - image: postgres:14-alpine + image: postgres:16-alpine # command: -c ssl=on -c ssl_cert_file=/run/secrets/server-cert.pem -c ssl_key_file=/run/secrets/server-key.pem -c ssl_ca_file=/run/secrets/root-ca.pem volumes: - ./zbx_env/var/lib/postgresql/data:/var/lib/postgresql/data:rw