Phil/piler-docker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(simatec) small Fix

Browse source
This commit is contained in:
simatec 2024-06-11 22:16:58 +02:00
parent 9394b451fc
commit cf13914db0
4 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/build.conf
View file

@ -8,4 +8,4 @@ PILER_VERSION="1.4.5"
# MariaDB Version # MariaDB Version
MARIA_DB_VERSION="10.6" MARIA_DB_VERSION="11.1.2"

12
config/piler-default.yml
View file

@ -4,7 +4,6 @@ services:
mysql: mysql:
image: mariadb:${MARIA_DB_VERSION} image: mariadb:${MARIA_DB_VERSION}
container_name: mysql_piler container_name: mysql_piler
#hostname: mysql
restart: unless-stopped restart: unless-stopped
cap_drop: cap_drop:
- ALL - ALL
@ -18,7 +17,7 @@ services:
- MYSQL_PASSWORD=${MYSQL_PASSWORD} - MYSQL_PASSWORD=${MYSQL_PASSWORD}
- MYSQL_RANDOM_ROOT_PASSWORD=yes - MYSQL_RANDOM_ROOT_PASSWORD=yes
- TZ="Europe/Berlin" - TZ="Europe/Berlin"
#- MARIADB_AUTO_UPGRADE=TRUE - MARIADB_AUTO_UPGRADE=TRUE
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
healthcheck: healthcheck:
test: mysql --user=${MYSQL_USER} --password=${MYSQL_PASSWORD} piler --execute "show tables" test: mysql --user=${MYSQL_USER} --password=${MYSQL_PASSWORD} piler --execute "show tables"
@ -32,7 +31,6 @@ services:
memcached: memcached:
image: memcached:latest image: memcached:latest
container_name: memcached_piler container_name: memcached_piler
#hostname: memcached
restart: unless-stopped restart: unless-stopped
cap_drop: cap_drop:
- ALL - ALL
@ -49,9 +47,9 @@ services:
- MYSQL_DATABASE=${MYSQL_DATABASE} - MYSQL_DATABASE=${MYSQL_DATABASE}
- MYSQL_USER=${MYSQL_USER} - MYSQL_USER=${MYSQL_USER}
- MYSQL_PASSWORD=${MYSQL_PASSWORD} - MYSQL_PASSWORD=${MYSQL_PASSWORD}
#- MYSQL_HOSTNAME=mysql - MYSQL_HOSTNAME=mysql_piler
- PILER_HOSTNAME=${PILER_DOMAIN} - PILER_HOSTNAME=${PILER_DOMAIN}
- MEMCACHED_HOST=memcached - MEMCACHED_HOST=memcached_piler
- TZ=${TIME_ZONE} - TZ=${TIME_ZONE}
- RT=1 - RT=1
ports: ports:
@ -79,8 +77,8 @@ services:
limits: limits:
memory: 512M memory: 512M
depends_on: depends_on:
- "memcached" - "memcached_piler"
- "mysql" - "mysql_piler"
volumes: volumes:
db_data: db_data:

12
config/piler-ssl.yml
View file

@ -25,7 +25,6 @@ services:
mysql: mysql:
image: mariadb:${MARIA_DB_VERSION} image: mariadb:${MARIA_DB_VERSION}
container_name: mysql_piler container_name: mysql_piler
#hostname: mysql
restart: unless-stopped restart: unless-stopped
cap_drop: cap_drop:
- ALL - ALL
@ -39,7 +38,7 @@ services:
- MYSQL_PASSWORD=${MYSQL_PASSWORD} - MYSQL_PASSWORD=${MYSQL_PASSWORD}
- MYSQL_RANDOM_ROOT_PASSWORD=yes - MYSQL_RANDOM_ROOT_PASSWORD=yes
- TZ="Europe/Berlin" - TZ="Europe/Berlin"
#- MARIADB_AUTO_UPGRADE=TRUE - MARIADB_AUTO_UPGRADE=TRUE
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
healthcheck: healthcheck:
test: mysql --user=${MYSQL_USER} --password=${MYSQL_PASSWORD} piler --execute "show tables" test: mysql --user=${MYSQL_USER} --password=${MYSQL_PASSWORD} piler --execute "show tables"
@ -53,7 +52,6 @@ services:
memcached: memcached:
image: memcached:latest image: memcached:latest
container_name: memcached_piler container_name: memcached_piler
#hostname: memcached
restart: unless-stopped restart: unless-stopped
cap_drop: cap_drop:
- ALL - ALL
@ -71,9 +69,9 @@ services:
- MYSQL_DATABASE=${MYSQL_DATABASE} - MYSQL_DATABASE=${MYSQL_DATABASE}
- MYSQL_USER=${MYSQL_USER} - MYSQL_USER=${MYSQL_USER}
- MYSQL_PASSWORD=${MYSQL_PASSWORD} - MYSQL_PASSWORD=${MYSQL_PASSWORD}
#- MYSQL_HOSTNAME=mysql - MYSQL_HOSTNAME=mysql_piler
- PILER_HOSTNAME=${PILER_DOMAIN} - PILER_HOSTNAME=${PILER_DOMAIN}
- MEMCACHED_HOST=memcached - MEMCACHED_HOST=memcached_piler
- TZ=${TIME_ZONE} - TZ=${TIME_ZONE}
- RT=1 - RT=1
- VIRTUAL_HOST=${PILER_DOMAIN} - VIRTUAL_HOST=${PILER_DOMAIN}
@ -103,8 +101,8 @@ services:
memory: 512M memory: 512M
depends_on: depends_on:
- "memcached" - "memcached_piler"
- "mysql" - "mysql_piler"
networks: networks:
default: default:

2
piler.conf.example
View file

@ -75,4 +75,4 @@ PILER_VERSION="1.4.5"
# MariaDB Version # MariaDB Version
MARIA_DB_VERSION="10.6" MARIA_DB_VERSION="11.1.2"