Commit graph

76 commits

Author SHA1 Message Date
sin-ev
02b3cfcf09
local enviroment
Switches default local setup to PostgreSQL and ARM64

Updates local development environment to use PostgreSQL instead of MariaDB by default, aligns configuration and documentation, and switches Docker service platforms to ARM64 for broader compatibility.

Improves developer experience and readiness for ARM-based systems.
2025-05-21 23:09:19 +02:00
Reuel Ramos Ribeiro
b5cfe3f735
chore: Update vscode-example scripts (#1613)
* chore: Add tasks.json file

* refactor: Remove deprecated pythonPath; redundant with settings.json anyway.

* fix: Use expected type for python debug

* feat: Run post clean task in seamless way

* feat: Add compunds config for easier setup

* style: Trigger pre-commit lint

* fix: honcho python environment in vscode launch.json

* fix: pre-commit prettier check

---------

Co-authored-by: Revant Nandgaonkar <revant.one@gmail.com>
2025-04-12 11:06:57 +05:30
bgodlin
bff029dca3
Fix installer.py (#1571)
* Update installer.py

Revising the `installer.py` script. The script is facing an issue during execution as it required interactive input for the root username unless the username was provided as a flag 42f9e537d0/frappe/installer.py (L157-L158). Resolving this by passing the username as a flag allows the script to proceed successfully.

* ci: pin pre-commit/prettier to 3.5.2

---------

Co-authored-by: Revant Nandgaonkar <revant.one@gmail.com>
2025-02-23 11:52:37 +05:30
0xD0M1M0
beecd99686
fix: --no-mariadb-socket is DEPRECATED (#1525)
--no-mariadb-socket is DEPRECATED; use --mariadb-user-host-login-scope='%' (wildcard) or --mariadb-user-host-login-scope=<myhostscope>, instead.
2024-12-07 17:29:14 +05:30
Bernhard Sirlinger
6f33a8aeba
feat: add defaultInterpreterPath as a vscode setting as a starting point according to docs (#1358)
See: https://github.com/microsoft/vscode-python/wiki/Setting-descriptions#pythondefaultinterpreterpath
2024-03-23 14:29:20 +05:30
varun-krishnamurthy
ead5438ebb
Cypress UI Test service and updates to installer.py (#1250)
* #1247 #1248 Feat: Cypress UI testing + Postgres Arg for installer

* #1247 #1248 Feat: Cypress UI testing + Postgres Arg for installer

* #1247 #1248 Feat: Cypress UI testing + Postgres Arg for installer

* #1247 #1248 Feat: Cypress UI testing + Postgres Arg for installer

* #1247 #1248 Feat: Cypress UI testing + Postgres Arg for installer

* #1247 #1248 Feat: Cypress UI testing + Postgres Arg for installer

* #1247 #1248 Feat: Cypress UI testing + Postgres Arg for installer
2023-10-26 08:35:31 +05:30
Revant Nandgaonkar
cc326b625a
fix: installer.py compatible with v14 (#1244) 2023-10-22 14:24:52 +05:30
Revant Nandgaonkar
f605addb71
refactor: prepare for v15 (#1243)
* chore: resolve merge conflict

* ci: changes for version 15

* chore: upgrade python and nodejs

* ci: fix v15 build

* fix: add redis_socketio for backward compatibility

* ci: fix v15 build

* ci: fix test endpoint

changed to erpnext.templates.pages.search_help.get_help_results_sections
2023-10-20 18:40:10 +05:30
Revant Nandgaonkar
d5aae2097d
fix: use python for installer script (#1178) 2023-07-11 17:18:11 +05:30
Leonard Goertz
4a18d57e8d
fix typo frape -> frappe (#1073) 2023-02-02 17:29:35 +05:30
Revant Nandgaonkar
e6088af885
refactor: build only one frappe/erpnext image (#1032)
* ci: skip frappe builds

* refactor: build only one frappe/erpnext image

* fix: lint nginx entrypoint script

* docs: update and organize docs

* docs: fix lint errors

* fix(custom): pass base64 encoded apps json

* ci: update dependabot

* docs: update contributing

* docs: remove info about multi image setup

* fix: initiate empty common_site_config.json

default config has host keys set to localhost
causes connection errors

* docs: add details for pwd volumes

* fix: symlink assets instead of copy

* fix: nginx private files

* ci: skip docker compose v2 install for ubuntu-latest

* fix: organize layers

* feat: allow remove git remote for custom image

* docs: allow remove git remote for custom image

* fix: remove duplicate --apps_path
2023-01-16 04:20:09 +05:30
Siraj Samsudeen
b0cc2bffc7
updated link to Docker Manual with screenshots (#1013)
* updated link to Docker Manual with screenshots

* added 2 images to docs/images and linked them
2022-12-20 10:46:50 +05:30
Smit Vora
e468921b5e
fix: incorrect eval for bool in bash (#995) 2022-11-04 17:12:13 +05:30
Smit Vora
01bd8f6bb2
feat: install client apps using script (#992)
* feat: install client apps using script

* chore: ignore shellcheck pre-commit
2022-11-03 12:59:11 +05:30
Imesha Sudasingha
36592fb3fd
Update default NodeJS version in development/README.md (#968)
For the frappe version 14
2022-10-18 03:56:29 +05:30
Revant Nandgaonkar
ba68887e40
fix: install node and python envs for v13 (#963)
fixes #962
2022-10-16 13:38:16 +05:30
George Everitt
cb16ab9091
Added the --resolve-deps flag to dev install (#950)
Fixes #947
2022-10-05 10:58:44 +05:30
Revant Nandgaonkar
369e6dd31e
docs: mention to install honcho in env (#839)
closes #816
2022-07-03 15:25:52 +05:30
Revant Nandgaonkar
1754e6872f
add python 3.10 (#837)
* fix: use py 3.10 for v14

closes #836

* docs: update development readme for py versions

* ci: update github actions py version to 3.10

* Quote Python version in yaml files

* fix: typo in environment variable

Co-authored-by: Lev Vereshchagin <mail@vrslev.com>
2022-07-03 15:09:10 +05:30
Abhirup Pal
a020885206
Fix container name in documentation. (#810) 2022-05-23 14:34:48 +05:30
Safwan Erooth
75b83237a0
docs: fixed app installation command. (#802)
- In the app installation step, the command has been fixed.
- also changed the example command to use version 13 of ERPNext instead of 12
2022-05-07 10:15:41 +05:30
Revant Nandgaonkar
78ca6a9f8f
fix: config commands (#762) 2022-04-06 10:56:04 +05:30
Revant Nandgaonkar
ba1902ad80
docs: use additional service during development (#758) 2022-04-06 05:08:26 +05:30
Lev
a9b6b755ce
Global refactoring (#617)
* Rename `bench-build` target to `bench` in bake file

* Update bake file and break everything

* Rename docker-compose.yml to compose.yml to avoid conflicting on `docker buildx bake`

* Fix groups in bake file

* Update frappe-worker

* Update frappe-nginx, erpnext-nginx

* Remove old erpnext images

* Update frappe-socketio

* Fix develop frappe-nginx build on linux/arm64

* Update dockerignore

* Update gitignore

* Update gitignore

* Update .env files

* Update installation (overrides)

* Update tests

* Fix image names

* Update compose

* Update get-latest-tags

* Update CI

* Setup and remove .env on tests

* Add build bench workflow

* Add triggers to main workflow

* Add release helm job

* Use reusable workflows

* Rollback

* Print configuration before running tests

* Show tests/.env

* Revert "Show tests/.env"

This reverts commit 4bc3bdebaf.

* Fix ci image versions

* Remove `frappe-` prefix in build directories

* Move requirements-dev.txt

* Fix image name in CI

* Update gitignore

* Update pre-commit config

* Drop `version:` in compose files

* Add push-backup

* Fix postgres CI test

* Change .yml to .yaml in compose file to follow compose-spec

* Remove prettierignore

* Fix dockerignore

* Change .yml to .yaml in compose file to follow compose-spec

* Don't depend on boto3 while testing (do it in backend)

* Update erpnext example version

* Don't fail ping on URLError

* Move assets volume to main compose file

* Fix type annotations for v12

* Fix postgres ci override in tests

* Fix spaces in socketio

* Reorder stages in nginx image, improve perfomance

* Remove unused todo

* Optimize worker build

* Install Node in worker image

* Add 502 error page

* Remove unused quiet-pull in tests

* Add configurator service to dynamically set common config

* Remove unused compose.ci-postgres.yml

* Use Python for configurator service: faster and more robust

* Add TODO.md

* Use python script to get latest tags in CI

* Clean up nginx dockerfile

* Remove VOLUME declaration

https://stackoverflow.com/a/55052682

* Add custom app example

* Remove pwd for now

* Remove pwd for now

* Use jq for parsing config in healthcheck

* Take advantage of yaml lang: add defaults in compose file. Also require env vars

* Fix CI

* Use resusable workflow

* Update

* Move release_helm job to main.yml

* Rename docker-build to docker-build-push

* Rename main to build_stable

* Rename bench targets

* Remove quotes from docker-build-push inputs

* Update build develop

* Remove HELM_DEPLOY_KEY secret from docker-build-push

* Add job names

* Remove build_bench workflow

* Update version input description in docker-build-push

* Print .env in tests, if version is develop, change to latest (for tag)

* Fix env setup

* Uncomment tests

* Parse and set short tags from git tag in bake file

* Move devcontainer settings to devcontainer.json

* Add db command notice

* Fix CI?

* Fix inconsistencies in development readme

* Remove pwd for now

* Remove custom apps for production instruction

* Update todos

* Add docs for images and compose files

* Add variables docs and allow custom frappe site name header

* Add notice about internal environment variables

* Update site-operations docs

* Update todos

* Add Overrides header in images-and-compose-files

* Update todos

* Remove extra docs

* Don't log requests in worker image (nginx already does that)

* Remove default value of FRAPPE_SITE_NAME_HEADER in example.env

* Use file that consistent in v12, v13 and develop to check /assets

* Fix paths in CI

* Update todos

* Remove TODO.md

* Update tests/_check_backup_files.py

Co-authored-by: Revant Nandgaonkar <revant.one@gmail.com>

* Change variables MINIO_ACCESS_KEY and MINIO_SECRET_KEY to S3_ACCESS_KEY, S3_SECRET_KEY in tests

* Fix S3 test

* Use `nginxinc/nginx-unprivileged` instead of `nginx` image

Also use Ngnix 1.20 instead of unstable 1.21

* Fix https override

* Update Dockerfile

* Mount assets to backend service in read only mode

* Touch .build (#307), use scripts from nginx image to generate config and touch .build

* Update example env after building stable images

* Touch `.build` on develop image (untill https://github.com/frappe/frappe/issues/15396 is resolved)

* Add `make` to worker build deps for linux/arm64

* Fix update example.env job

* Fix .build creation on develop branch

* Move bench CI to different file

This way workflow runs only on PRs that relevant to bench build

* Fix app name in custom app example

* Update erpnext and frappe versions in example.env

* Don't install `svg-sprite` and `sass` node modules in nginx image on linux/arm64 (https://github.com/frappe/frappe/pull/15275)

* docs: README and docs

* docs: add link to site operations from docker swarm

* ci: fix tests as per changes to compose.yaml

* docs: move wiki articles to docs

* docs: fix add custom domain

* docs: fix patch code from images

* fix: do not expose port 80 for old images

* fix: custom domain labels to frontend container/service

* Add missing descriptions to envs in example.env

* Fix redis depends_on

* Fix docker compose in tests when not running on TTY

* Set -T flag in `docker compose exec` only if not tty

* Run pre-commit on docs

* Remove postgres healthcheck (it gets overriden by mariadb)

* Refactor test

* Update workflow names

* Add pip to dependabot config

* docs: backup and push (#19)

* Beautify changes by @revant (#20)

* feat: add gevent to worker image

* feat: real_ip configuration for nginx

* Return `healthcheck.sh` just for tests

Co-authored-by: Lev Vereshchagin <mail@vrslev.com>

* Make pretend bench catch unknown commands (closes #666)

* Remove debug print in push-backup

* Fix typing issues in push-backup

* Update file keys in push-backups: from abs path to <site>/<file>

* Refactor push-backup

* Move gevent installation in Frappe step

* Don't pin boto stubs requirement

* Cache pip deps on build

* Update example env versions

* Refactor check backup files

* Fix backup test

* Fix backup test

* Rename build/ dir to images/

* Rename build/ dir to images/

* Fix /build -> /images in docs

* Update example.env

* Use reusable workflow in frappe user instead of vrslev

* Fix compose`s `project` option in docs (https://github.com/frappe/frappe_docker/pull/617#issuecomment-1065178792)

* Add note about project option in site-operations doc

* Update example env

* Rename build arg `USERNAME` to `REGISTRY_USER`

* Allow https proxy to access Docker socket

* Revert "Use reusable workflow in frappe user instead of vrslev"

This reverts commit 6062500d0d.

* Revert "Revert "Use reusable workflow in frappe user instead of vrslev""

This reverts commit 4680d18ff8.

Co-authored-by: Revant Nandgaonkar <revant.one@gmail.com>
2022-03-14 11:23:03 +05:30
Babuuu
3ba01027de
Change mysql.user to mysql.global_priv -> for MariaDB 10.4+ (#650)
Co-authored-by: meradoch <meradoch@notdeadeyes.notdeadeyes>
2022-02-12 17:39:15 +05:30
Lev
8e34d092f8
Fix pre-commit config (#657)
* Fix pre-commit config

* Lint settings.json
2022-02-08 12:27:54 +03:00
Vaibhav Chopra
55a4dc9269
Update settings.json (#648)
removes a squiggly line whenever doing imports like 
```
from frappe.model.document import Document
```
2022-02-02 17:25:19 +05:30
Lev Vereshchagin
be7c6254f8 chore(lint): Run codespell 2021-12-10 11:54:51 +03:00
Lev Vereshchagin
fb07581595 chore(lint): Run prettier 2021-12-10 11:53:43 +03:00
Lev Vereshchagin
3e4e66769b chore(lint): Run end-of-file-fixer 2021-12-10 11:51:11 +03:00
Revant Nandgaonkar
aadb0a8139 feat: allow devcontainer vscode configuration 2021-11-30 17:27:25 +05:30
Revant Nandgaonkar
0af1302485
fix: install py 3.7 using pyenv (#590)
* fix: install py 3.7 using pyenv

* fix: set pyenv global versions

* refactor: cleaup code
2021-11-30 16:03:01 +05:30
Revant Nandgaonkar
401613900f docs: update dev README for v13 2021-09-15 15:10:19 +05:30
Revant Nandgaonkar
c6da8a1d98 feat: improve and upgrade build
use nodejs v14
allow build args to pass repo and branch
2021-05-21 14:30:55 +05:30
manasan3010
8c05801b64
Update README.MD for clarity
Added a warning to prevent a common mistake that I made during my installation. 
Sourced from https://discuss.erpnext.com/t/how-to-get-started-with-the-official-docker-image/60710/2?u=manasan
2020-12-02 19:52:40 +05:30
Florian HENRY
3ec5c6563c review comment 2020-11-05 20:09:12 +01:00
Florian HENRY
3dedd7b018 review comment 2020-11-05 20:07:48 +01:00
Florian HENRY
a2c4ecef2d review comment 2020-11-05 20:07:08 +01:00
Florian HENRY
68a1a28b88 update documentation 2020-11-01 17:43:08 +01:00
Hendy Irawan
07606e9f8d
docs(development): VSCode launch configuration "Honcho SocketIO Watch Schedule Worker"
Requested by @revant https://github.com/frappe/frappe_docker/pull/365#issuecomment-705680972

[skip travis]
2020-10-09 22:45:48 +07:00
Hendy Irawan
4af8944add
build: Add honcho start to launch.json
As recommended in `README.md` when Bench Web is debugged separately.
2020-10-08 14:05:43 +07:00
Revant Nandgaonkar
247a8e8e2d fix: gitignore .devcontainer 2020-08-01 23:27:56 +05:30
Hendy Irawan
55e4a53d5b refactor: Disable PostgreSQL by default, fixes #317 2020-08-01 12:26:53 +07:00
Revant Nandgaonkar
8fe7d324d9 fix: workaround for vscode debugger issue
[skip travis]

fixes #313
2020-07-17 07:05:39 +05:30
Revant Nandgaonkar
04f98778bb docs: frappe docker support for PostgreSQL 2020-06-30 15:27:14 +05:30
Revant Nandgaonkar
daef926b06 feat(frappe/bench): allow 5 benches 2020-06-11 12:55:27 +05:30
africlouds
8ca5879211
Updated build images commands
Before starting the images, build the frappe images
2020-06-10 09:30:57 +02:00
africlouds
84bf55860a
Updated Docs for multi bench 2020-06-10 09:28:38 +02:00
Sam Prasad
945a9e3979
Updated VSCode Remote Containers extension
As I was going through the installation process, I noticed the steps for VSCode Remote Containers were a little unclear.
I also a fixed a typo in Line 14
2020-05-31 20:02:55 -04:00
Revant Nandgaonkar
ed03259c17 feat: debug workers in vscode devcontainers
[skip travis]
2020-05-24 05:34:28 +05:30