Revant Nandgaonkar
c43e973481
fix(frappe-worker): install wait-for-it deb package
2020-09-16 05:06:07 +05:30
Revant Nandgaonkar
a4c814f994
fix: health check
...
use shell script instead of python
2020-09-15 23:18:28 +05:30
Revant Nandgaonkar
f77a9bbe66
fix(erpnext-nginx): add node-sass as production dependency
2020-09-02 22:13:50 +05:30
Revant Nandgaonkar
e9080d3952
fix: accept args for bench commands
2020-08-30 00:06:56 +05:30
Revant Nandgaonkar
8cfd762c61
feat: frappe commands
...
execute frappe commands with bench
2020-08-13 13:48:46 +05:30
Revant Nandgaonkar
bd157c6de9
Revert "chore: change public files slug for restore-backup"
...
This reverts commit dcf0c0f8b1
.
2020-08-07 16:02:45 +05:30
Revant Nandgaonkar
1c74ac2e0b
Revert "chore: change public file slug in push-backup"
...
This reverts commit 9dff8f2561
.
2020-08-07 16:02:15 +05:30
Revant Nandgaonkar
a3bdc3c8f9
fix: remove nunjucks from nginx image preparation
2020-08-07 15:28:15 +05:30
Chinmay D. Pai
dcf0c0f8b1
chore: change public files slug for restore-backup
...
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-08-07 12:47:20 +05:30
Chinmay D. Pai
9dff8f2561
chore: change public file slug in push-backup
...
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-08-07 12:21:15 +05:30
Revant Nandgaonkar
7c293d7f9e
fix: use same python and nginx image
2020-08-06 22:38:52 +05:30
Revant Nandgaonkar
a7cd40a2b7
fix: add node-sass to nodejs dependencies after prod install
2020-08-06 19:30:27 +05:30
Revant Nandgaonkar
0d9aa27f5f
fix: symlink to node_modules
2020-08-06 15:18:32 +05:30
Revant Nandgaonkar
a69853e950
fix: add nunjucks to nodejs devDependencies
2020-08-06 14:26:05 +05:30
Revant Nandgaonkar
6c3ccd12fa
fix: add node-sass to nodejs dependencies
2020-08-06 14:24:22 +05:30
Revant Nandgaonkar
6b94d991e2
fix: add nodejs via nvm
2020-08-05 21:40:37 +05:30
peter
a956388a1a
fix: grant privileges for rds when restoring backup
2020-08-04 11:11:58 +01:00
Revant Nandgaonkar
dbd56ee99b
fix(erpnext-nginx): remove unused docker-entrypoint script
...
fixes #321
2020-08-02 19:22:35 +05:30
Revant Nandgaonkar
c2a0e4f057
fix: condition for grants for aws rds
2020-07-16 06:08:24 +05:30
Revant Nandgaonkar
c2ebdfcf8b
fix: condition for mariadb grants for aws rds
2020-07-16 06:06:48 +05:30
Revant Nandgaonkar
9a22832389
fix: mariadb grants for aws rds
2020-07-15 21:28:52 +05:30
Sun Howwrongbum
e513b9c8ce
feat: touch .build
2020-07-13 23:12:29 +05:30
Revant Nandgaonkar
84fefb2283
refactor: add utils and constants
2020-07-10 23:15:36 +05:30
Revant Nandgaonkar
36f150bd95
fix: mysql restore db command with subprocess
2020-07-10 19:45:28 +05:30
Revant Nandgaonkar
21e2b13955
fix: mysql db commands with subprocess
2020-07-10 19:39:00 +05:30
Revant Nandgaonkar
4598cb24f4
fix: file input with subprocess
2020-07-10 16:18:25 +05:30
Revant Nandgaonkar
31ff697835
fix: mysql command with subprocess
2020-07-10 15:42:36 +05:30
Revant Nandgaonkar
fa2aff47df
fix: psql command with subprocess
2020-07-10 15:04:29 +05:30
Chinmay D. Pai
bafa7f6598
fix: remove quotes from psql db restore
...
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-07-10 10:27:36 +05:30
Chinmay D. Pai
1d9dd966b1
fix: pipe uncompressed database to file
...
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-07-10 10:07:22 +05:30
Chinmay D. Pai
c67fc02452
fix: make changes to psql restore
...
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-07-09 22:57:12 +05:30
Chinmay D. Pai
5c57334bb6
fix: move run_command to utils
...
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-07-09 17:27:54 +05:30
Chinmay D. Pai
2b2a57a85d
fix: use subprocess instead of os to run commands
...
* add a wrapper method run_command
* remove os.system calls
* use f-strings for commands
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-07-09 17:01:50 +05:30
Revant Nandgaonkar
251d6590cf
fix: nginx config
...
use $scheme://$http_host instead of $http_referer
fixes socketio
2020-07-06 14:44:52 +05:30
Revant Nandgaonkar
5648e3a6c4
feat: ping additional services using doctor
...
handle error
docs entry for health check command
2020-07-02 13:40:23 +05:30
Revant Nandgaonkar
6dfb1de5c6
feat: ping additional services using doctor
...
doctor --ping-service postgres:5432 -p mariadb:3306
2020-07-01 20:01:47 +05:30
Revant Nandgaonkar
e097f54481
fix: bench image
...
use specific version(s) of nodejs
[skip travis]
2020-07-01 04:24:49 +05:30
Revant Nandgaonkar
f871834dbe
feat: dev environment also starts postgresql
2020-06-30 15:25:10 +05:30
Revant Nandgaonkar
8a93944de7
feat: optional site level db connection
2020-06-30 06:32:46 +05:30
Revant Nandgaonkar
87558b7f0d
feat: add postgres support to frappe-worker
2020-06-29 23:28:10 +05:30
Revant Nandgaonkar
56bf984ef7
fix: erpnext image build
...
frappe/erpnext MUST be in editable mode
output migration log in test
2020-06-28 07:40:33 +05:30
Revant Nandgaonkar
e6946fda75
fix: erpnext image build
...
set PYTHONUNBUFFERED for better logging
2020-06-28 05:58:45 +05:30
Revant Nandgaonkar
f5071122ed
fix: erpnext image build
...
improve travis.py
python packages not installed in editable mode
use venv module instead of virtualenv
2020-06-28 05:55:15 +05:30
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
1a1636df55
fix: fresh restore site_config backup
2020-06-26 05:47:17 +05:30
Chinmay D. Pai
95416ee555
fix: check for all possible site config backups
...
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-06-25 23:42:55 +05:30
Chinmay D. Pai
bdbcf40702
fix: restore encryption key on site restore
...
if encryption key exists for a site, it will now be restored to the site
config while restoring site
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-06-25 23:27:35 +05:30
Revant Nandgaonkar
af5854fc33
refactor: backup site_config.json
...
closes #282
2020-06-25 18:57:25 +05:30
Revant Nandgaonkar
eac54ebe00
fix: migrate command
...
importing migrate() needs frappe.init
2020-06-21 13:23:22 +05:30
Revant Nandgaonkar
90556e75bc
Merge pull request #276 from africlouds/develop
...
Install less in bench Dockerfile
2020-06-19 20:09:00 +05:30
africlouds
d17ea1366a
Install less in bench Dockerfile
...
Without less install, tools like bench --site site_name mariadb are not displaying results
2020-06-19 07:44:02 +02:00
Javier López
4e26ca653c
fix: use remote_addr instead of header ip
2020-06-17 14:37:38 -05:00
Revant Nandgaonkar
c618bd86d9
feat: wait for connection before creating site
2020-06-12 23:12:52 +05:30
Revant Nandgaonkar
daef926b06
feat(frappe/bench): allow 5 benches
2020-06-11 12:55:27 +05:30
Revant Nandgaonkar
93c1dc50d5
fix: only download and restore latest backup
2020-05-22 15:15:33 +05:30
Revant Nandgaonkar
b057e12bdc
update: use wkhtmltopdf for buster_amd64
2020-05-19 12:10:09 +05:30
Revant Nandgaonkar
20f1fa0000
chore: update frappe/bench image
...
use latest nodejs v10 and v12
use cloned bench for bench development
2020-05-18 00:18:08 +05:30
Revant Nandgaonkar
9e1841f494
fix: push site_config.json with backup
2020-05-09 00:30:15 +05:30
paulator
52dbc49c21
Fix socketio error in reverse proxy setup
2020-05-06 11:11:55 +02:00
Revant Nandgaonkar
05cb6a4596
build v13-beta images
2020-05-02 00:21:56 +05:30
Revant Nandgaonkar
e1f0e62211
fix: restore backup grant privileges command
2020-04-29 22:52:15 +05:30
Revant Nandgaonkar
3181bc66b3
fix: restore backup create user password command
2020-04-29 19:32:51 +05:30
Revant Nandgaonkar
8ac55c86f9
fix: always disable maintenance mode after migration
2020-04-29 14:03:28 +05:30
Revant Nandgaonkar
e8b9710052
fix: mysql error during set db password
2020-04-29 14:03:11 +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
479ce83f5c
fix: required region s3 compatible backup/restore
2020-04-26 22:48:35 +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
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
529c23866f
fix(frappe-nginx): fix connection message
2020-04-21 14:59:06 +05:30
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
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
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
Revant Nandgaonkar
2422fbad26
fix: backup and restore
...
create backup dir in worker images
set ownership and mount volume for backups
update readme about restore backup
2020-03-27 16:41:32 +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
3a6f7e1934
feat: resotre backups from volume or cloud
2020-03-27 00:28:50 +05:30
Revant Nandgaonkar
754ba8a91a
feat: restrict backups to backup limit for each site
2020-03-25 22:25:24 +05:30
Revant Nandgaonkar
5f187c4e3f
feat: worker command to push backups to cloud
2020-03-25 06:35:49 +05:30
Revant Nandgaonkar
14dc20d510
fix: do not auto migrate on first run
2020-03-22 19:08:41 +05:30
Revant Nandgaonkar
674c766480
feat: auto migrate on container start if AUTO_MIGRATE set
2020-03-21 15:47:35 +05:30
Revant Nandgaonkar
7c356ccb27
fix: make python commands modular and reusable
2020-03-20 20:56:23 +05:30
Revant Nandgaonkar
f1393c3a94
fix(frappe-nginx): fix missing /rsync
...
fixes #160
2020-03-20 05:21:30 +05:30
Revant Nandgaonkar
8475af3785
fix(frappe-worker): set sites volume ownership
2020-03-17 22:31:37 +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
6e8d2bf7c2
fix: nginx config
...
add updates from frappe/bench to config
2020-03-15 00:20:28 +05:30
Revant Nandgaonkar
40ceb79023
fix: python container healthcheck
...
ping all backing services
2020-03-14 22:47:35 +05:30
Revant Nandgaonkar
56124984d7
fix(bench): debugger fail after bench update
...
fix debugger fail after bench update
error locale.Error: unsupported locale setting
add locale to image
2020-03-12 05:53:47 +05:30
Revant Nandgaonkar
f506c25a6e
feat(bench): bash-completion
...
add bash-completion package
remove install_packages duplicates
workdir set to /home/frappe
2020-03-11 22:38:48 +05:30
Revant Nandgaonkar
ae8d880702
Merge pull request #135 from fermiumlabs/update-debian
...
Update debian
2020-03-10 06:07:15 +05:30
Davide Bortolami
ba239c0ebe
Install yarn in both nodes
2020-03-10 00:08:50 +00:00
Davide Bortolami
31f770d467
UID GID 1000
2020-03-10 00:00:46 +00:00
Davide Bortolami
1e9cdacf1a
Reduce layers
2020-03-09 23:37:25 +00:00
Davide Bortolami
104f3e67e2
reduce layers
2020-03-09 13:39:28 +00:00
Davide Bortolami
b36513f8fd
fix image build fail
2020-03-09 13:29:58 +00:00
Davide Bortolami
07a43e5386
removed not needed volume
2020-03-09 13:26:42 +00:00
Davide Bortolami
8611c2dc05
reduce layers, cleanup comments
2020-03-08 23:37:30 +00:00
Davide Bortolami
0746693c1f
some other useful software
2020-03-08 19:07:03 +00:00
Davide Bortolami
ae5979ee8f
Fixed node and python installation, local user
2020-03-08 18:37:26 +00:00