2
0
mirror of https://github.com/frappe/frappe_docker.git synced 2024-09-20 02:59:02 +00:00
Commit Graph

13 Commits

Author SHA1 Message Date
Revant Nandgaonkar
18e8f05c9f fix: erpnext image build errors 2020-06-28 00:22:23 +05:30
Revant Nandgaonkar
7106124a07 refactor: reuse Dockerfile(s) 2020-06-27 23:44:13 +05:30
Revant Nandgaonkar
05cb6a4596 build v13-beta images 2020-05-02 00:21:56 +05:30
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
f1393c3a94 fix(frappe-nginx): fix missing /rsync
fixes #160
2020-03-20 05:21:30 +05:30
Revant Nandgaonkar
1db512d334 fix: travis wrapper script for build on master
third attempt to get builds on master running
2020-03-17 00:14:16 +05:30
Revant Nandgaonkar
0f03713e5c fix: erpnext nginx image install_app script 2020-03-07 16:45:53 +05:30
Revant Nandgaonkar
e5a5a05dfb fix: erpnext nginx image build 2020-03-07 15:47:50 +05:30
Revant Nandgaonkar
d00770e42f fix: install_app set branch 2020-03-07 05:33:32 +05:30
chabad360
7bdd329793 some small changes 2020-03-06 06:23:53 +00:00
chabad360
1c513f9e41 Merge remote-tracking branch 'upstream/develop' into install_app 2020-03-06 06:21:07 +00:00
Revant Nandgaonkar
6782decfc6 fix: resolve travis yml conflicts
use travis.py
2020-03-05 12:05:32 +05:30
Davide Bortolami
6f7a9b92ac Refactor renaming erpnext-assets and frappe-assets to erpnext-nginx and frappe-nginx 2020-03-03 23:40:11 +00:00