new release !
This commit is contained in:
1 parent
b0e0fdbf5a
commit
b1f19594b8
2 files changed
+26
-11
No files matched your search
@@ -1,12 +1,14 @@
|
|||||||
|
# MariaDB
|
||||||
MYSQL_USER=etherpad
|
MYSQL_USER=etherpad
|
||||||
MYSQL_DATABASE=etherpad
|
MYSQL_DATABASE=etherpad
|
||||||
#MYSQL_PASSWORD=
|
|
||||||
#MYSQL_ROOT_PASSWORD=
|
# Etherpad
|
||||||
|
NODE_ENV=production
|
||||||
|
TRUST_PROXY=true
|
||||||
|
|
||||||
DB_TYPE=mysql
|
DB_TYPE=mysql
|
||||||
DB_HOST=padnetignet_mariadb
|
DB_HOST=mariadb
|
||||||
DB_NAME=etherpad
|
DB_NAME=etherpad
|
||||||
DB_USER=etherpad
|
DB_USER=etherpad
|
||||||
#DB_PASS=
|
|
||||||
DB_CHARSET=utf8mb4
|
DB_CHARSET=utf8mb4
|
||||||
#ADMIN_PASSWORD=
|
|
||||||
+19
-6
@@ -1,28 +1,41 @@
|
|||||||
|
name: padnetignet
|
||||||
|
|
||||||
services:
|
services:
|
||||||
mariadb:
|
mariadb:
|
||||||
image: mariadb:latest
|
image: mariadb:latest
|
||||||
container_name: padnetignet_mariadb
|
restart: unless-stopped
|
||||||
|
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
- ../passwords/padnetignet.pass
|
- ../passwords/padnetignet.pass
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
- ./volumes/mysql:/var/lib/mysql
|
- ./volumes/mysql:/var/lib/mysql
|
||||||
|
|
||||||
|
command:
|
||||||
|
- mariadbd
|
||||||
|
- --character-set-server=utf8mb4
|
||||||
|
- --collation-server=utf8mb4_unicode_ci
|
||||||
|
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
|
test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
|
||||||
start_period: 10s
|
start_period: 10s
|
||||||
interval: 10s
|
interval: 10s
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 3
|
retries: 3
|
||||||
command: ['mariadbd', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci']
|
|
||||||
restart: unless-stopped
|
|
||||||
etherpad:
|
etherpad:
|
||||||
image: etherpad/etherpad:latest
|
image: etherpad/etherpad:latest
|
||||||
container_name: padnetignet_etherpad
|
restart: unless-stopped
|
||||||
|
|
||||||
depends_on:
|
depends_on:
|
||||||
- mariadb
|
mariadb:
|
||||||
|
condition: service_healthy
|
||||||
|
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
- ../passwords/padnetignet.pass
|
- ../passwords/padnetignet.pass
|
||||||
|
|
||||||
ports:
|
ports:
|
||||||
- "127.0.0.1:9005:9001"
|
- "127.0.0.1:9005:9001"
|
||||||
restart: unless-stopped
|
|
||||||
Reference in new issue
Block a user