girish pasupathy
|
7498d5439a
|
Support for reading Mariadb and Admin password from file when using docker secrets
With this PR, password can be read from docker secrets in both compose as well as swarm environment.
```YAML
secrets:
mariadb-root-password:
file: mariadb-root-password.txt
erpnext-admin-password:
file: erpnext-admin-password.txt
services:
erpnext:
image: frappe/erpnext-worker:${ERPNEXT_VERSION:-v12.5.2}
environment:
- SITE_NAME=example.com
- DB_ROOT_USER=root
- MARIADB_HOST=mariadb
- INSTALL_APPS=erpnext
- FORCE=1
- REDIS_CACHE=redis-cache:6379
- REDIS_QUEUE=redis-queue:6379
- REDIS_SOCKETIO=redis-socketio:6379
- SOCKETIO_PORT=9000
- AUTO_MIGRATE=1
- ADMIN_PASSWORD_FILE=/run/secrets/erpnext-admin-password
- MYSQL_ROOT_PASSWORD_FILE=/run/secrets/mariadb-root-password
secrets:
- erpnext-admin-password
- mariadb-root-password
restart: on-failure
volumes:
- erpnext-data:/home/frappe/frappe-bench/sites
- assets-data:/home/frappe/frappe-bench/sites/assets
links:
- redis-cache
- redis-queue
- redis-socketio
- mariadb
depends_on:
- mariadb
- redis-cache
- redis-queue
- redis-socketio
networks:
- erpnext-net
```
Reference: [Addind docker secrets in to your images](https://docs.docker.com/engine/swarm/secrets/#build-support-for-docker-secrets-into-your-images)
Changes to be committed:
modified: ../../README.md
modified: ../common/commands/new.py
modified: ../common/commands/restore_backup.py
modified: ../erpnext-nginx/docker-entrypoint.sh
|
2020-04-16 11:49:40 +05:30 |
|
Revant Nandgaonkar
|
4e7b7690ee
|
fix: backup and restore
new command FORCE=1 error fixed
only push backups if exists
prepare and process db restore
|
2020-03-27 16:07:12 +05:30 |
|
Revant Nandgaonkar
|
7c356ccb27
|
fix: make python commands modular and reusable
|
2020-03-20 20:56:23 +05:30 |
|
Revant Nandgaonkar
|
07806f1086
|
fix: worker new-site command
fixes #128
|
2020-03-07 19:39:59 +05:30 |
|
chabad360
|
d6e012e9c0
|
resolve merge conflicts
|
2020-03-05 01:43:50 +00:00 |
|
chabad360
|
959ab4fc7d
|
one small change to support multi-tenancy
|
2020-03-05 01:38:01 +00:00 |
|
Revant Nandgaonkar
|
501d144728
|
fix: worker images new site command
install apps is a list not boolean
|
2020-03-04 14:36:13 +05:30 |
|
Revant Nandgaonkar
|
c2c09400da
|
fix: use commonly known variable for MYSQL_ROOT_PASSWORD
|
2020-03-02 05:08:49 +05:30 |
|
Revant Nandgaonkar
|
33b5071aaa
|
fix: Frappe/ERPNext worker image new site command
|
2020-03-01 16:45:34 +05:30 |
|
Revant Nandgaonkar
|
242708df0c
|
refactor: reuse common scripts and files
move common scripts to build/common
|
2020-02-20 18:01:23 +05:30 |
|