Skip to content

Commit

Permalink
Updated MySQL startup options and updated PostgreSQL version from 14 …
Browse files Browse the repository at this point in the history
…to 15
  • Loading branch information
dotneft committed Sep 28, 2023
1 parent 53dc4d1 commit a201f0a
Show file tree
Hide file tree
Showing 16 changed files with 48 additions and 28 deletions.
5 changes: 3 additions & 2 deletions docker-compose_v3_alpine_mysql_latest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions docker-compose_v3_alpine_mysql_local.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions docker-compose_v3_alpine_pgsql_latest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions docker-compose_v3_alpine_pgsql_local.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
4 changes: 3 additions & 1 deletion docker-compose_v3_centos_mysql_latest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion docker-compose_v3_centos_mysql_local.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions docker-compose_v3_centos_pgsql_latest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
5 changes: 3 additions & 2 deletions docker-compose_v3_centos_pgsql_local.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
4 changes: 3 additions & 1 deletion docker-compose_v3_ol_mysql_latest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion docker-compose_v3_ol_mysql_local.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions docker-compose_v3_ol_pgsql_latest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
5 changes: 3 additions & 2 deletions docker-compose_v3_ol_pgsql_local.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
4 changes: 3 additions & 1 deletion docker-compose_v3_ubuntu_mysql_latest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion docker-compose_v3_ubuntu_mysql_local.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions docker-compose_v3_ubuntu_pgsql_latest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
5 changes: 3 additions & 2 deletions docker-compose_v3_ubuntu_pgsql_local.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down

0 comments on commit a201f0a

Please sign in to comment.