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
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
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
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
Tim Bolender
3772d580cc
Remove obsolete instruction
2020-04-14 17:40:54 +02:00
Tim Bolender
6fb8f2d654
Do not use file system volume for sites
2020-04-14 17:23:27 +02:00
Revant Nandgaonkar
b554c37148
Merge pull request #185 from revant/fix-readme
...
fix: improve readme
2020-04-10 14:27:37 +05:30
Revant Nandgaonkar
362075a2bc
fix: improve readme
...
mention to add site for production deployment
mention to start bench for development deployment
fixes #181
2020-04-10 14:26:00 +05:30
Revant Nandgaonkar
1b6ede5e89
Merge pull request #184 from girip11/develop
...
Changed X-Frappe-Site-Name header to use value from `$host` instead o…
2020-04-10 12:00:00 +05:30
girish pasupathy
87c251a464
Changed X-Frappe-Site-Name header to use value from $host
instead of $http_host
in nginx configuration
...
ISSUE
-----
`$http_host` is used for setting header 'X-Frappe-Site-Name'
which adds port number to the header along with the host value. Frappe source app.py expects the header
value to contain only the host name and not the port number. So `$host` should be used instead of
`$http_host` to set the 'X-Frappe-Site-Name' header
`$http_host` vs `$host` in nginx
--------------------------------
`$http_host` contains the host name along with port number whereas `$host` contains only the host name in lowercase without the port number.
> `$host` - This variable is equal to line Host in the header of request or
> name of the server processing the request if the Host header is not available.
> This variable may have a different value from $http_host in such cases:
> * when the Host input header is absent or has an empty value,
> `$host` equals to the value of server_name directive;
> * when the value of Host contains port number, `$host` doesn't include
> that port number. $host's value is always lowercase since 0.8.17.
> - [$host vs $http_host stackoverflow](https://stackoverflow.com/questions/15414810/whats-the-difference-of-host-and-http-host-in-nginx )
From the frappe source file [app.py](https://github.com/frappe/frappe/blob/develop/frappe/app.py#L107 ), X-Frappe-Site-Name is used if its set.
```Python
site = _site or request.headers.get('X-Frappe-Site-Name') or get_site_name(request.host)
```
Since `$host` variable will never contain port number which is not the case with `$http_host`,
`$host` should be used for setting the header 'X-Frappe-Site-Name'. Otherwise we have issues with site serving.
Tested the above changes in compose as well as in swarm environment.
In compose, tested the site with host mapping of 80 and 8000. Works with both the host port mapping.
Tested with erpnext version - v12.5.2
Changes to be committed:
modified: build/common/nginx-default.conf.template
2020-04-09 18:58:34 +05:30
Davide Bortolami
bddf592216
Merge pull request #180 from revant/backup-docs-readme
...
docs: add info about backup command in readme
2020-03-30 12:34:39 +01:00
Revant Nandgaonkar
830d3959b7
docs: add info about backup command in readme
2020-03-30 13:08:55 +05:30
Davide Bortolami
64d03c85c9
fix stale issues messages
2020-03-29 22:45:34 +01:00