2
0
mirror of https://github.com/frappe/frappe_docker.git synced 2024-09-19 18:49:01 +00:00
Commit Graph

46 Commits

Author SHA1 Message Date
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
Lev
28a588b402
Fix example.env workflow failures (#728) 2022-03-24 10:11:48 +03:00
dependabot[bot]
6f2e48d3e8
chore(deps): bump peter-evans/create-pull-request from 3 to 4 (#725)
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 3 to 4.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v3...v4)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  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-23 11:56:40 +03:00
dependabot[bot]
2ef5c41420
chore(deps): bump actions/cache from 2 to 3 (#723)
Bumps [actions/cache](https://github.com/actions/cache) from 2 to 3.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/cache
  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-23 11:09:07 +03:00
Lev
437afb1776
Make build workflows run if files that they're are described in change (#696)
* Make build workflows run if files that they're are described in change (closes #691)

* Update
2022-03-14 13:20:39 +03:00
dependabot[bot]
8ce210c532
chore(deps): bump actions/setup-python from 2 to 3 (#682)
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-14 12:57:30 +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
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
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
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 Vereshchagin
fb07581595 chore(lint): Run prettier 2021-12-10 11:53:43 +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
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
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
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
Revant Nandgaonkar
d320db2d04 ci: use git command to config git creds 2021-11-11 06:30:33 +05:30
Revant Nandgaonkar
cbf646b326 ci: fix steps for helm release 2021-11-11 05:06:57 +05:30
Revant Nandgaonkar
6a8440be34 ci: change git creds action for helm release 2021-11-10 22:10:51 +05:30
Revant Nandgaonkar
c0a4079cdf
ci: fix git creds for helm release (#561) 2021-11-10 21:42:19 +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
b57371edf3
chore: Add version constraint for lint action 2021-11-09 14:52:44 +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
de04eb032c
build: Fix develop build 2021-11-06 21:11:29 +03:00
Lev
089a2dc206
build: Fix stable builds (#546) 2021-11-06 21:07:39 +03:00
Lev
daa1926f03 Revert "update"
This reverts commit ce1ed546ab.
2021-11-06 20:02:42 +03:00
Lev
ce1ed546ab update 2021-11-06 20:01:55 +03:00
Lev
9a4aa8d226 ci: Lint on PR 2021-11-05 19:36:47 +03:00
Lev
9fa3e1b0e0
Merge branch 'main' into improve-tests-and-fix-builds 2021-11-05 19:01:18 +03:00
Lev
d2b18a3b48 update 2021-11-05 18:58:02 +03:00
Lev
de255d8052 ci: Fix stable build 2021-11-04 19:00:16 +03:00
Lev
3c0f08652e ci: Push images right after build
This fixes the bug when ERPNext images are built upon old Frappe images and test are ran on old images
2021-11-04 15:24:08 +03:00
Lev
2da9c02d58
ci: Build fixes
- Simplify builds by separating dev/stable workflows
- Fix Helm deploy key
- Remove deploy_key.env (already using deploy key in secrets)
- Fix paths matching on push and pull_request triggers
- Fix possible issues with tag difference between ERPNext and Frappe (add tag resolving step before pushing)
- Don't login, push Docker images and release Helm chart on forks
- Don't test on version 12 (there's no test for this version)
- Remove frappe-installer (from chore: use github actions #525)
- Fix badges in readme
2021-10-31 11:02:58 +05:30
Revant Nandgaonkar
37b8ccece1
Merge pull request #528 from frappe/dependabot/github_actions/actions/stale-4
chore(deps): bump actions/stale from 1 to 4
2021-10-30 18:28:17 +05:30
Revant Nandgaonkar
7d36be56f4 ci: fixes ci steps
helm release deploy key uses webfactory/ssh-agent@v0.5.3
test only on PR
docker login only if not PR
2021-10-30 11:47:12 +05:30
Revant Nandgaonkar
107f393277 ci: fix base64 decode of env variable 2021-10-29 22:44:30 +05:30
Lev
1daec15268 ci(Build): Fix paths for PRs and branches 2021-10-29 13:44:25 +03:00
dependabot[bot]
7518c2d374
chore(deps): bump actions/stale from 1 to 4
Bumps [actions/stale](https://github.com/actions/stale) from 1 to 4.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v1...v4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-29 06:04:50 +00:00
Lev
b18119574b
ci: Use base64 encoded helm deploy key 2021-10-28 10:39:24 +03:00
Lev
a3cf159439 ci: Uncomment for-production code 2021-10-27 16:27:46 +03:00
Lev
1cbb845af1 ci: Use GitHub Actions to build images 2021-10-27 16:07:43 +03:00
Davide Bortolami
64d03c85c9 fix stale issues messages 2020-03-29 22:45:34 +01:00
Davide Bortolami
ebd9d877d9
Create stale.yml 2020-03-24 17:09:09 +00:00