(simatec) small Fix
This commit is contained in:
parent
9394b451fc
commit
cf13914db0
4 changed files with 12 additions and 16 deletions
|
@ -8,4 +8,4 @@ PILER_VERSION="1.4.5"
|
|||
|
||||
# MariaDB Version
|
||||
|
||||
MARIA_DB_VERSION="10.6"
|
||||
MARIA_DB_VERSION="11.1.2"
|
|
@ -4,7 +4,6 @@ services:
|
|||
mysql:
|
||||
image: mariadb:${MARIA_DB_VERSION}
|
||||
container_name: mysql_piler
|
||||
#hostname: mysql
|
||||
restart: unless-stopped
|
||||
cap_drop:
|
||||
- ALL
|
||||
|
@ -18,7 +17,7 @@ services:
|
|||
- MYSQL_PASSWORD=${MYSQL_PASSWORD}
|
||||
- MYSQL_RANDOM_ROOT_PASSWORD=yes
|
||||
- TZ="Europe/Berlin"
|
||||
#- MARIADB_AUTO_UPGRADE=TRUE
|
||||
- MARIADB_AUTO_UPGRADE=TRUE
|
||||
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
|
||||
healthcheck:
|
||||
test: mysql --user=${MYSQL_USER} --password=${MYSQL_PASSWORD} piler --execute "show tables"
|
||||
|
@ -32,7 +31,6 @@ services:
|
|||
memcached:
|
||||
image: memcached:latest
|
||||
container_name: memcached_piler
|
||||
#hostname: memcached
|
||||
restart: unless-stopped
|
||||
cap_drop:
|
||||
- ALL
|
||||
|
@ -49,9 +47,9 @@ services:
|
|||
- MYSQL_DATABASE=${MYSQL_DATABASE}
|
||||
- MYSQL_USER=${MYSQL_USER}
|
||||
- MYSQL_PASSWORD=${MYSQL_PASSWORD}
|
||||
#- MYSQL_HOSTNAME=mysql
|
||||
- MYSQL_HOSTNAME=mysql_piler
|
||||
- PILER_HOSTNAME=${PILER_DOMAIN}
|
||||
- MEMCACHED_HOST=memcached
|
||||
- MEMCACHED_HOST=memcached_piler
|
||||
- TZ=${TIME_ZONE}
|
||||
- RT=1
|
||||
ports:
|
||||
|
@ -79,8 +77,8 @@ services:
|
|||
limits:
|
||||
memory: 512M
|
||||
depends_on:
|
||||
- "memcached"
|
||||
- "mysql"
|
||||
- "memcached_piler"
|
||||
- "mysql_piler"
|
||||
|
||||
volumes:
|
||||
db_data:
|
||||
|
|
|
@ -25,7 +25,6 @@ services:
|
|||
mysql:
|
||||
image: mariadb:${MARIA_DB_VERSION}
|
||||
container_name: mysql_piler
|
||||
#hostname: mysql
|
||||
restart: unless-stopped
|
||||
cap_drop:
|
||||
- ALL
|
||||
|
@ -39,7 +38,7 @@ services:
|
|||
- MYSQL_PASSWORD=${MYSQL_PASSWORD}
|
||||
- MYSQL_RANDOM_ROOT_PASSWORD=yes
|
||||
- TZ="Europe/Berlin"
|
||||
#- MARIADB_AUTO_UPGRADE=TRUE
|
||||
- MARIADB_AUTO_UPGRADE=TRUE
|
||||
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
|
||||
healthcheck:
|
||||
test: mysql --user=${MYSQL_USER} --password=${MYSQL_PASSWORD} piler --execute "show tables"
|
||||
|
@ -53,7 +52,6 @@ services:
|
|||
memcached:
|
||||
image: memcached:latest
|
||||
container_name: memcached_piler
|
||||
#hostname: memcached
|
||||
restart: unless-stopped
|
||||
cap_drop:
|
||||
- ALL
|
||||
|
@ -71,9 +69,9 @@ services:
|
|||
- MYSQL_DATABASE=${MYSQL_DATABASE}
|
||||
- MYSQL_USER=${MYSQL_USER}
|
||||
- MYSQL_PASSWORD=${MYSQL_PASSWORD}
|
||||
#- MYSQL_HOSTNAME=mysql
|
||||
- MYSQL_HOSTNAME=mysql_piler
|
||||
- PILER_HOSTNAME=${PILER_DOMAIN}
|
||||
- MEMCACHED_HOST=memcached
|
||||
- MEMCACHED_HOST=memcached_piler
|
||||
- TZ=${TIME_ZONE}
|
||||
- RT=1
|
||||
- VIRTUAL_HOST=${PILER_DOMAIN}
|
||||
|
@ -103,8 +101,8 @@ services:
|
|||
memory: 512M
|
||||
|
||||
depends_on:
|
||||
- "memcached"
|
||||
- "mysql"
|
||||
- "memcached_piler"
|
||||
- "mysql_piler"
|
||||
|
||||
networks:
|
||||
default:
|
||||
|
|
|
@ -75,4 +75,4 @@ PILER_VERSION="1.4.5"
|
|||
|
||||
# MariaDB Version
|
||||
|
||||
MARIA_DB_VERSION="10.6"
|
||||
MARIA_DB_VERSION="11.1.2"
|
||||
|
|
Loading…
Reference in a new issue