2
0
mirror of https://github.com/frappe/frappe_docker.git synced 2024-11-09 14:50:58 +00:00
Commit Graph

46 Commits

Author SHA1 Message Date
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
7d1d9b17fd
fix: use ping api instead of version api (#1190) 2023-07-24 12:49:49 +05:30
Revant Nandgaonkar
a580385295
fix: traefik router for acme certs (#1068)
* fix: traefik router for acme certs

* fix: set default for sites

* test: use .localhost site names
2023-02-02 13:45:06 +05:30
Revant Nandgaonkar
c013942d1f
fix: use docker volumes (#1067)
* fix: use docker volumes

remove bind mount
use docker volumes

* ci: remove payments app from tests
2023-01-31 09:48:52 +05:30
Revant Nandgaonkar
bb1e4bb341
feat: add restic (#1044)
* feat: add restic

allows incremental snapshot backups
remove custom push-backup script

* ci: remove .git dir to skip fetch_details_from_tag

fixes https://github.com/frappe/frappe_docker/actions/runs/3938883301/jobs/6738091655
2023-01-18 11:31:18 +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
Revant Nandgaonkar
6fa946a630
fix: install frappe/payments for v14 and develop (#867)
* fix: install frappe/payments for v14 and develop

* fix: test installs payments as per version

* fix: copy all apps for erpnext images

* fix: test installs payments on version-14

* fix: get_latest_tags script

* fix: docker build condition for v14
2022-08-02 06:01:13 +05:30
Lev
9f502c8538
Fix builds failing (#793)
* Fix builds failing
Fixes #792

* Suppress `docker compose down` errors in cleanup

* Cover all cases

* Fix linting

* Remove unused import
2022-05-02 03:58:25 +05:30
Lev
6fa358ca4e
Build for v12 (#750)
* Build for v12

Typo!!

* Fix Python 3.7 compatibility

* Skip assets endpoint test on v12
2022-04-03 15:57:22 +05:30
Lev
269156ff7d
Fix develop build (#731)
* Prevent tests from modifying $GITHUB_ENV

This fixes develop build.

* Update frappe git url in dev requirements

* Update
2022-03-24 11:30:19 +03:00
Lev
41ba718b21
Use pytest (#705)
* Use pytest for tests

* Pin black

* Update CI

* Rename test_main to test_frappe_docker

* Force project name "test"
2022-03-24 10:40:56 +03:00
Revant Nandgaonkar
79760daf9b
fix: link frappe node_modules to make Website Theme work (#702)
* fix: link frappe node_modules to make Website Theme work

* Add website theme test

* Fix failing test

Co-authored-by: Lev Vereshchagin <mail@vrslev.com>
2022-03-16 13:39:16 +03:00
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
Lev Vereshchagin
0b861de117 chore(lint): Run shfmt 2021-12-10 11:56:18 +03:00
Lev
e629dd313e
chore: Fix pwd url and move pwd.yml away from tests directory (#603) 2021-12-05 18:56:21 +03:00
Lev
399414bcab
fix: Remove --log.level=DEBUG from traefik command to reduce log verbosity (#600) 2021-12-05 16:49:02 +05:30
Lev
81ec8da94f
feat: Upgrade mariadb and use command instead of copying config file (#597) 2021-12-05 14:32:08 +05:30
Lev
5aae67117c
Build ERPNext images on top fresh Frappe images (#582)
Update build_stable.yml
2021-11-24 05:10:27 +05:30
Revant Nandgaonkar
1427907a82 ci: revert shell script functions 2021-11-22 13:22:09 +05:30
Revant Nandgaonkar
91648299ba ci: fix test and revert yamls 2021-11-22 13:17:17 +05:30
Revant Nandgaonkar
d68bcdc8bd ci: output erpnext-nginx container logs 2021-11-22 06:14:30 +05:30
Revant Nandgaonkar
8fc3fbb27e ci: fix lint 2021-11-22 05:36:59 +05:30
Revant Nandgaonkar
4f7108c3a8 ci: check connections before curl 2021-11-22 05:22:12 +05:30
Revant Nandgaonkar
cb2943bdf7 ci: reload volume permissions 2021-11-21 22:37:22 +05:30
Revant Nandgaonkar
3295c8070e fix: change unpriviliged nginx port from 80 to 8080 2021-11-21 16:23:32 +05:30
Lev
5254e2aad3
fix: Improve CI, fix builds (#554)
* ci(Test): Add `workflow_dispatch` trigger

* ci(Test): Build and run on push and pr

* test: Set failfast, remove ERPNext reference

* test: Reveal .env file for logs

* ci(Test): Rename step

* ci(Test): Fix git tag

* test: Add -x flag for debugging

* test: Fix failing test

* ci(Test): Check if built images are used

* ci(Test): Configure trigger paths, don't build on schedule

* test: Remove bug

* ci: Build and test stable images on PR

* fix(frappe-nginx): Get back to `ls` from `find`

* check if test passes with erpnext images

* fix(frappe-worker): Default sites in backup command

* get integration test changes back

* chore: Fix linting
2021-11-09 15:15:33 +03:00
Lev
f74f730b5e
chore: Fix lint issues (#553)
* ci(Lint): Temporarily disable branch contraint

* chore(erpnext-nginx): Fix linting

* chore: Fix linting issues

* ci(Lint): Add -x flag

* ci(Lint): Fix push trigger

* chore: Fix linting and formatting

* fix: Gunicorn server start

* chore(frappe-worker): Fix linting

* chore(frappe-nginx): Fix linting

* fix(erpnext-nginx): App installation

* fix(erpnext-nginx): App installation

* refactor(frappe-nginx): Use `find` instead of `ls`
2021-11-09 13:05:29 +03:00
Lev
d2b18a3b48 update 2021-11-05 18:58:02 +03:00
Lev
1cbb845af1 ci: Use GitHub Actions to build images 2021-10-27 16:07:43 +03:00
Revant Nandgaonkar
f0399fa389 ci: fix check format script
[skip travis]
2021-06-24 17:43:25 +05:30
Revant Nandgaonkar
86a2fcc1fa ci: check shell script format 2021-06-24 16:54:17 +05:30
pratikbalar
12eb5c92e4 refactor: bash scripts [stip travis]
- shellchecke and shfmt checked and formatted
- indentation 2 spaces
- redirect errors to stderr
- short if where possible
- add function string to clarify visuaally identify its a funtion
- make [ ... ] to [[ ... ]]
- use == for comparision
- use cat based notes
- remove unecessary spaces
- double quotes where needed
2021-06-23 09:13:24 +05:30
pratikbalar
e6a5209001 refactor: style as per google style guide (tried)
- https://google.github.io/styleguide/
2021-06-22 15:44:25 +05:30
Revant Nandgaonkar
24ba1cd551 chore: change ci script to build v13 2021-04-02 07:26:44 +05:30
Revant Nandgaonkar
e2e103e181 tests: mount assets-vol for migrate command test 2020-10-02 12:45:13 +05:30
Chinmay D. Pai
d5c153bfbe
ci: add tests for drop-site
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-10-01 16:38:35 +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
29e727491b fix: pwd socketio hostname
[skip travis]
2020-07-07 12:18:06 +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
3558765a03 test: add tests for postgresql site 2020-06-30 15:26:40 +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
f77ca7726c test: fix cgo errors before building 2020-06-26 10:19:27 +05:30
Revant Nandgaonkar
8beb6a284f test: add tests
overwrite restore
check index pages of created sites
improve formatting
2020-06-26 06:06:28 +05:30
Revant Nandgaonkar
7bb49f081d test: play with docker
[skip travis]
2020-06-25 22:04:52 +05:30
Revant Nandgaonkar
4f12e61a7a test: all worker commands 2020-05-01 16:54:52 +05:30