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

789 Commits

Author SHA1 Message Date
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
95aeb32e2d
fix: new site command on Frappe >13.21.0 (#677) 2022-03-08 13:28:11 +03:00
dependabot[bot]
e1f32b7476
chore(deps): bump actions/checkout from 2 to 3 (#673)
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-04 22:35:27 +03:00
dependabot[bot]
cc5c0b6485
chore(deps): bump actions/setup-python from 2 to 3 (#672)
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2 to 3.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-02 10:12:53 +03:00
dependabot[bot]
66fca59f74
chore(deps): bump docker/bake-action from 1.6.0 to 1.7.0 (#665)
Bumps [docker/bake-action](https://github.com/docker/bake-action) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/docker/bake-action/releases)
- [Commits](https://github.com/docker/bake-action/compare/v1.6.0...v1.7.0)

---
updated-dependencies:
- dependency-name: docker/bake-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-16 09:05:23 +03:00
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
Lev
05853825d8
build: Change bench target names and move CI to separate workflow (#655)
* Change bench target names and move CI to separate workflow

* Fix file detection
2022-02-08 11:35:52 +03:00
github-actions[bot]
b02191f3f8
chore(deps): Update pre-commit hooks (#652)
Co-authored-by: vrslev <vrslev@users.noreply.github.com>
2022-02-06 21:43:22 +05:30
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
github-actions[bot]
7404bcadee
chore(deps): Update pre-commit hooks (#644)
Co-authored-by: vrslev <vrslev@users.noreply.github.com>
2022-01-31 12:13:43 +03:00
Nicolás Bottini
18a16372b2
Update references to $ERPNEXT_VERSION (#631)
* Update references to $ERPNEXT_VERSION

Documentation is making references to an unexisting $VERSION variable. I'm updating it to $ERPNEXT_VERSION.

* Update site-operations.md to use $FRAPPE_VERSION 

Fix references to $ERPNEXT_VERSION when using frappe/frappe-worker so now it uses $FRAPPE_VERSION
2022-01-12 12:41:50 +05:30
Robproject
42bfd485f8
Change erpnext-python volumes description (#628) 2022-01-07 14:05:04 +05:30
github-actions[bot]
52f91b318c
chore(deps): Update pre-commit hooks (#625)
Co-authored-by: vrslev <vrslev@users.noreply.github.com>
2022-01-05 18:45:56 +03:00
github-actions[bot]
a46a97dc81
chore(deps): Update pre-commit hooks (#623)
Co-authored-by: vrslev <vrslev@users.noreply.github.com>
2021-12-30 09:59:56 +03:00
vrslev
d573ba8769 chore(deps): Update pre-commit hooks 2021-12-26 13:15:30 +03:00
vrslev
4daa31e1cf chore(deps): Update pre-commit hooks 2021-12-24 13:45:18 +03:00
github-actions[bot]
c2b1543128
chore(deps): Update pre-commit hooks (#618)
Co-authored-by: vrslev <vrslev@users.noreply.github.com>
2021-12-19 14:01:18 +05:30
Lev
adaa753d89
fix: Bench initialization with ERPNext v12 on frappe/bench (#613) 2021-12-11 13:57:10 +05:30
vrslev
e665b014ca chore(deps): Update pre-commit hooks 2021-12-11 10:44:51 +03:00
Lev
6b93efdf3c
chore: Rename LICENSE.md to LICENSE (#608) 2021-12-10 16:25:57 +05:30
Lev
407ac2f836
ci: Remove greetings workflow (#610)
It is quite annoying, not very useful and takes 30–50 seconds to finish
2021-12-10 16:24:48 +05:30
Lev
db7823a2e2
chore(lint): Take hooks configs out so linting works without pre-commit too (#609) 2021-12-10 12:31:44 +03:00
Lev
3171f212ab
Merge pull request #607 from vrslev/run-pre-commit
chore: Run pre-commit
2021-12-10 12:26:45 +03:00
Lev Vereshchagin
0b861de117 chore(lint): Run shfmt 2021-12-10 11:56:18 +03:00
Lev Vereshchagin
be7c6254f8 chore(lint): Run codespell 2021-12-10 11:54:51 +03:00
Lev Vereshchagin
1c9c4bd780 chore(lint): Change exclude in codespell hook 2021-12-10 11:54:27 +03:00
Lev Vereshchagin
fb07581595 chore(lint): Run prettier 2021-12-10 11:53:43 +03:00
Lev Vereshchagin
8b4dfce4f0 chore(lint): Run isort 2021-12-10 11:53:00 +03:00
Lev Vereshchagin
f8b7b7af05 chore(lint): Run black 2021-12-10 11:52:40 +03:00
Lev Vereshchagin
c4772bc5b5 chore(lint): Run pyupgrade 2021-12-10 11:51:47 +03:00
Lev Vereshchagin
3e4e66769b chore(lint): Run end-of-file-fixer 2021-12-10 11:51:11 +03:00
Lev Vereshchagin
9f0d602c72 chore(lint): Fix trailing-whitespace 2021-12-10 11:50:39 +03:00
Lev
2ac2b7ce43
chore: Use pre-commit framework (#604)
* Add pre-commit, prettier configs and editorconfig

* Remove `check-toml` hook

* Add isort config

* Add codespell config

* Update hooks

* Remove prettierignore

* Add shellcheck config

* Add lint workflow

* Add pre-commit autoupdate workflow

* Remove path constraints from lint workflow

* Fix CI

* Add guide to CONTRIBUTING.md

* Fix (probably) shfmt

* Fix (probably) shfmt

* Fix (probably) shfmt
2021-12-10 11:48:00 +03:00
Revant Nandgaonkar
65f6228be8
fix: update devcontainer mariadb (#605) 2021-12-06 17:55:24 +05:30
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
6378473c43
fix(bench): Set BENCH_DEVELOPER env var in bashrc instead of Dockerfile (#598) 2021-12-05 16:45:50 +05:30
Lev
442c767338
ci(lint): Specify paths that trigger workflow (#601) 2021-12-05 12:44:34 +03:00
Lev
a48ae2d12e
ci: Move greetings.yml to appropriate folder (#599) 2021-12-05 12:24:09 +03:00
Lev
81ec8da94f
feat: Upgrade mariadb and use command instead of copying config file (#597) 2021-12-05 14:32:08 +05:30
Lev
180b9ababc
docs: Update CONTRIBUTING.md (#594) 2021-12-03 05:06:58 +05:30
Lev
9b49391dbb
feat(bench): Don't show editable-bench warnings (#593) 2021-12-02 20:36:07 +05:30
Chinmay Pai
c87ee80a22
Merge pull request #592 from revant/feat-allow-devcont-config 2021-11-30 23:28:16 +05:30
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
Lev
9a986575f6
ci: Fix paths that trigger workflows (#587) 2021-11-26 19:52:17 +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
d049e33b40
Merge pull request #579 from frappe/dependabot/github_actions/webfactory/ssh-agent-0.5.4
chore(deps): bump webfactory/ssh-agent from 0.5.3 to 0.5.4
2021-11-22 19:13:42 +05:30
dependabot[bot]
a9c3f6e9b9
chore(deps): bump webfactory/ssh-agent from 0.5.3 to 0.5.4
Bumps [webfactory/ssh-agent](https://github.com/webfactory/ssh-agent) from 0.5.3 to 0.5.4.
- [Release notes](https://github.com/webfactory/ssh-agent/releases)
- [Changelog](https://github.com/webfactory/ssh-agent/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webfactory/ssh-agent/compare/v0.5.3...v0.5.4)

---
updated-dependencies:
- dependency-name: webfactory/ssh-agent
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-22 10:06:05 +00:00