accounting/frappe_docker
2
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2024-12-27 03:42:39 +00:00
Code Issues Releases Activity
1,257 Commits 5 Branches 0 Tags 109 MiB
4717c3ee73
Commit Graph

1257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Revant Nandgaonkar
e8b9710052 fix: mysql error during set db password 2020-04-29 14:03:11 +05:30
Revant Nandgaonkar
361c0f6047
Merge pull request #218 from Thunderbottom/commands-semantic-fix 
fix: make semantic changes to commands
 2020-04-29 13:37:37 +05:30
Chinmay D. Pai
8f20e5e00d
chore: escape backticks on db commands 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-04-29 11:44:58 +05:30
Chinmay D. Pai
884a82d814
fix: make semantic changes to commands 
* add missing __main__ call to commands.py
* remove unnecessary imports
* fix backup WITH_FILES logic
* follow python semantics (?)

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-04-29 01:45:59 +05:30
Revant Nandgaonkar
5a5a79f206
Merge pull request #217 from revant/fix-readme-version-tag 
fix: README site operations image version tag
 2020-04-27 17:34:12 +05:30
Revant Nandgaonkar
2bfc7d6958 fix: README site operations image version tag 2020-04-27 17:32:28 +05:30
Chinmay Pai
b94a260660
Merge pull request #216 from revant/improve-docker-commands 2020-04-27 16:37:44 +05:30
Revant Nandgaonkar
081ca6f085 fix: README 
source additional .env for site operations
 2020-04-27 14:38:33 +05:30
Revant Nandgaonkar
0361b281f9 fix: README 
single command to deploy locally
env file placed where docker-compose will be executed
 2020-04-27 13:36:33 +05:30
Revant Nandgaonkar
264c2745a2
Merge pull request #215 from revant/fix-s3-region 
fix: required region s3 compatible backup/restore
 2020-04-26 22:53:53 +05:30
Revant Nandgaonkar
479ce83f5c fix: required region s3 compatible backup/restore 2020-04-26 22:48:35 +05:30
Revant Nandgaonkar
c4608066ea
Merge pull request #212 from frappe/develop 
ERPNext v12.7.1 and Frappe v12.5.1
 2020-04-23 23:00:42 +05:30
Revant Nandgaonkar
0c2cf1da50
Merge pull request #211 from revant/revert-v12-dockerfile 
revert(frappe-nginx): revert v12.Dockerfile
 2020-04-23 22:07:27 +05:30
Revant Nandgaonkar
7599252a62 revert(frappe-nginx): revert v12.Dockerfile 
standard_style.css generation not required for v12
 2020-04-23 21:56:52 +05:30
Chinmay Pai
aac3efb24b
Merge pull request #210 from revant/fix-website-style-css 2020-04-23 21:47:23 +05:30
Revant Nandgaonkar
4f411104f3 fix(frappe-nginx): Generate Standard Style CSS 
use nunjucks to render jinja2 template
generate default theme
 2020-04-23 14:56:46 +05:30
Revant Nandgaonkar
974f7dd74c
Merge pull request #195 from tbolender/sites-volume 
Use Docker volumes for storing sites
 2020-04-22 18:43:27 +05:30
Revant Nandgaonkar
4322759338
Merge pull request #205 from resourcefactor/patch-2 
Update README.md
 2020-04-22 18:42:00 +05:30
Revant Nandgaonkar
11ce87b7d0 fix: README typo 2020-04-22 18:40:19 +05:30
Davide Bortolami
d2d68023e1
Merge pull request #204 from resourcefactor/patch-1 
Update README.md
 2020-04-22 13:21:04 +01:00
resourcefactor
7c91718280
Update README.md 2020-04-22 16:20:44 +04:00
resourcefactor
2d928049b5
Update README.md 2020-04-22 16:19:37 +04:00
Tim Bolender
b633ea05de Instruct usage of RDS 2020-04-22 11:11:15 +02:00
Tim Bolender
00165a240a Fixed command line volume usage 2020-04-22 10:53:37 +02:00
Revant Nandgaonkar
484f713bee
Merge pull request #202 from revant/fix-nginx-startup-message 
fix(frappe-nginx): fix connection message
 2020-04-21 15:01:26 +05:30
Revant Nandgaonkar
529c23866f fix(frappe-nginx): fix connection message 2020-04-21 14:59:06 +05:30
Tim Bolender
16cc6baf4c Use sites volume in all commands 2020-04-20 11:11:38 +02:00
Tim Bolender
3ed66d8333 Add volumes to container description 2020-04-20 11:05:51 +02:00
Revant Nandgaonkar
4ef7723f02
Merge pull request #201 from Thunderbottom/master 
Merge branch 'develop'
 2020-04-20 13:45:15 +05:30
Chinmay D. Pai
81cd8aceab
Merge branch 'develop' 
merging branch to trigger a build on erpnext version-12 for a fix that wasn't released in the tag
 2020-04-20 13:40:14 +05:30
Davide Bortolami
2da8f699d3
Merge pull request #200 from fermiumlabs/develop 
Develop
 2020-04-19 19:02:58 +01:00
Davide Bortolami
018af3292e
Update development/README.md 
Co-Authored-By: Revant Nandgaonkar <revant.one@gmail.com>
 2020-04-19 19:02:22 +01:00
Davide Bortolami
d07faa84b8 clenup extensions 2020-04-19 16:51:53 +01:00
Davide Bortolami
03fae6e63d FINALLY vscode and jupyter works in the documentation 2020-04-19 16:37:21 +01:00
Davide Bortolami
776a827a8c Added an opinionated set of extensions that will provide a common base for development and tutorials 2020-04-19 14:00:35 +01:00
Davide Bortolami
2cf40627b4 Updated jupyter instructions 2020-04-19 13:59:44 +01:00
Davide Bortolami
d356a6f44a Update documentation, fix a few small errors, reorganize, add instructions for unattended install 2020-04-19 13:43:09 +01:00
Revant Nandgaonkar
03321a3b2d
Merge pull request #199 from frappe/ddavidebor-travis-badge 
Add travis badge
 2020-04-19 11:56:06 +05:30
Davide Bortolami
5a66c1d5d0
Add travis badge 2020-04-19 01:18:21 +01:00
Revant Nandgaonkar
6124319ba1
Merge pull request #197 from fermiumlabs/develop 
Development environment improvements
 2020-04-18 00:56:55 +05:30
Davide Bortolami
8397499e85 Fixes 2020-04-17 20:15:11 +01:00
Davide Bortolami
ac85e36311 Typo 2020-04-17 18:59:10 +01:00
Revant Nandgaonkar
c54d29fd62
Merge pull request #194 from frappe/develop 
ERPNext v12.7.0 and Frappe v12.5.0
 2020-04-17 13:00:54 +05:30
Davide Bortolami
5f823fe37c doc jupyter updates 2020-04-17 03:26:16 +01:00
Davide Bortolami
85a824753b Improve documentation, including new instructions for jupyterlab 2020-04-17 02:57:20 +01:00
Davide Bortolami
5f3c4df4ad automatically install python extension 2020-04-17 02:56:30 +01:00
Davide Bortolami
87e0648c3d Merge commit '78b2db1af10c0f94a50395f06f6021934921fe17' into develop 2020-04-17 00:34:42 +01:00
Davide Bortolami
2e0a863ef7 Update documentation, add ssh-client to bench build, expose MariaDB port in development 2020-04-17 00:34:22 +01:00
Revant Nandgaonkar
78b2db1af1
Merge pull request #187 from girip11/develop 
Support for reading Mariadb and Admin password from file when using d…
 2020-04-16 22:59:15 +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