diff --git a/docker-compose_v3_alpine_mysql_latest.yaml b/docker-compose_v3_alpine_mysql_latest.yaml index 325d6027b..b90f1889f 100644 --- a/docker-compose_v3_alpine_mysql_latest.yaml +++ b/docker-compose_v3_alpine_mysql_latest.yaml @@ -424,8 +424,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 9cbbe38bb..d43f264dc 100644 --- a/docker-compose_v3_alpine_mysql_local.yaml +++ b/docker-compose_v3_alpine_mysql_local.yaml @@ -518,8 +518,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 208f8b2d4..5afc164bc 100644 --- a/docker-compose_v3_alpine_pgsql_latest.yaml +++ b/docker-compose_v3_alpine_pgsql_latest.yaml @@ -417,8 +417,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: @@ -436,7 +436,7 @@ services: - mysql-database postgres-server: - image: postgres:14-alpine + image: postgres:15-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 6f25f31da..7b0fa3508 100644 --- a/docker-compose_v3_alpine_pgsql_local.yaml +++ b/docker-compose_v3_alpine_pgsql_local.yaml @@ -524,8 +524,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: @@ -543,7 +543,7 @@ services: - mysql-database postgres-server: - image: postgres:14-alpine + image: postgres:15-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 48f3a7670..7f74cde8b 100644 --- a/docker-compose_v3_centos_mysql_latest.yaml +++ b/docker-compose_v3_centos_mysql_latest.yaml @@ -424,7 +424,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 48c72c1f5..5fa29f008 100644 --- a/docker-compose_v3_centos_mysql_local.yaml +++ b/docker-compose_v3_centos_mysql_local.yaml @@ -518,7 +518,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 f09038693..78295c6d7 100644 --- a/docker-compose_v3_centos_pgsql_latest.yaml +++ b/docker-compose_v3_centos_pgsql_latest.yaml @@ -417,7 +417,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: @@ -435,7 +436,7 @@ services: - mysql-database postgres-server: - image: postgres:14-alpine + image: postgres:15-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 0d3e1e6fe..a7695fda0 100644 --- a/docker-compose_v3_centos_pgsql_local.yaml +++ b/docker-compose_v3_centos_pgsql_local.yaml @@ -524,7 +524,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: @@ -542,7 +543,7 @@ services: - mysql-database postgres-server: - image: postgres:14-alpine + image: postgres:15-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 4d2f88d56..12e4f8a63 100644 --- a/docker-compose_v3_ol_mysql_latest.yaml +++ b/docker-compose_v3_ol_mysql_latest.yaml @@ -424,7 +424,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 1ba669b5c..ede52014d 100644 --- a/docker-compose_v3_ol_mysql_local.yaml +++ b/docker-compose_v3_ol_mysql_local.yaml @@ -518,7 +518,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 9de20e837..1d510ae20 100644 --- a/docker-compose_v3_ol_pgsql_latest.yaml +++ b/docker-compose_v3_ol_pgsql_latest.yaml @@ -417,7 +417,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: @@ -435,7 +436,7 @@ services: - mysql-database postgres-server: - image: postgres:14-alpine + image: postgres:15-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 e6fa3cad7..08e3bf39b 100644 --- a/docker-compose_v3_ol_pgsql_local.yaml +++ b/docker-compose_v3_ol_pgsql_local.yaml @@ -524,7 +524,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: @@ -542,7 +543,7 @@ services: - mysql-database postgres-server: - image: postgres:14-alpine + image: postgres:15-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 e3c8e63ae..69052c64c 100644 --- a/docker-compose_v3_ubuntu_mysql_latest.yaml +++ b/docker-compose_v3_ubuntu_mysql_latest.yaml @@ -416,7 +416,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 c42d71374..476c51d3c 100644 --- a/docker-compose_v3_ubuntu_mysql_local.yaml +++ b/docker-compose_v3_ubuntu_mysql_local.yaml @@ -512,7 +512,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 d69b49a65..9c3fd3956 100644 --- a/docker-compose_v3_ubuntu_pgsql_latest.yaml +++ b/docker-compose_v3_ubuntu_pgsql_latest.yaml @@ -411,7 +411,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: @@ -429,7 +430,7 @@ services: - mysql-database postgres-server: - image: postgres:14-alpine + image: postgres:15-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 2b45bcb5b..7112a558b 100644 --- a/docker-compose_v3_ubuntu_pgsql_local.yaml +++ b/docker-compose_v3_ubuntu_pgsql_local.yaml @@ -518,7 +518,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: @@ -536,7 +537,7 @@ services: - mysql-database postgres-server: - image: postgres:14-alpine + image: postgres:15-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