2
0
mirror of https://github.com/frappe/frappe_docker.git synced 2024-12-23 10:38:58 +00:00
Commit Graph

98 Commits

Author SHA1 Message Date
Revant Nandgaonkar
e362c26fc1
docs: improve and organize docs (#791)
* docs: improve and organize docs

* docs: improve setup options
2022-05-02 05:47:53 +05:30
Revant Nandgaonkar
b83938c0b8
docs: remove obsolete swarm related documentation (#763) 2022-04-06 15:33:40 +05:30
Revant Nandgaonkar
fda82636b1
feat: add PWD button (#754)
* feat: add PWD button

* ci: change update versions workflow name
2022-04-04 15:02:08 +05:30
Revant Nandgaonkar
1448e46a9b
docs: single server setup example (#715)
* docs: single server setup example

* docs: lint single server setup example

* docs: LAN based setup

* docs: fix traefik ssl override

* docs: move data directory to user home

* docs: remove env-file from exec commands
2022-04-03 12:26:46 +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
Lev Vereshchagin
fb07581595 chore(lint): Run prettier 2021-12-10 11:53:43 +03:00
Lev Vereshchagin
9f0d602c72 chore(lint): Fix trailing-whitespace 2021-12-10 11:50:39 +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
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
Lev
078a7f5602 chore: Rename badge 2021-10-27 16:10:14 +03:00
Lev
1cbb845af1 ci: Use GitHub Actions to build images 2021-10-27 16:07:43 +03:00
Revant Nandgaonkar
d82714cfa3 docs: mention PWD admin credentials
[skip travis]
2021-04-10 21:03:53 +05:30
Revant Nandgaonkar
bc3b3aa83e docs: improve docs
Add section about wiki in contribution section
Mention about wiki in README
Mention about cron job in README
[skip travis]
2021-02-25 15:30:03 +05:30
Revant Nandgaonkar
092348d748 docs(frappe-nginx): configurable nginx http timeout
[skip travis]
2021-01-04 18:45:42 +05:30
Revant Nandgaonkar
f255385070 fix: README
travis badges
add play with docker button
[skip travis]
2020-07-01 05:56:31 +05:30
Revant Nandgaonkar
fb46aae2c0 ci: trigger build 2020-06-17 15:15:56 +05:30
Revant Nandgaonkar
f2d61450fe fix: README contributions url
[skip travis]
2020-06-14 21:24:50 +05:30
Revant Nandgaonkar
6a83a9d8cc docs: organize fix links
[skip travis]
2020-06-13 15:40:47 +05:30
Revant Nandgaonkar
38be99fc5e docs: organize docs
break down readme into multiple files
organize in docs directory
[skip travis]
2020-06-13 15:33:06 +05:30
Maxwell Simmer
2689aa8d06 Updates README 2020-05-22 11:30:29 +02:00
Revant Nandgaonkar
2fe9826f64 [skip travis] Update README
fix sentence to avoid version/tag confusion
2020-05-05 13:20:07 +05:30
Revant Nandgaonkar
33672e09e4 [skip travis] Update README 2020-05-05 13:18:36 +05:30
Revant Nandgaonkar
0d9d1dcf42 [skip travis] Update README 2020-05-05 13:12:25 +05:30
Revant Nandgaonkar
2bfc7d6958 fix: README site operations image version tag 2020-04-27 17:32:28 +05:30
Revant Nandgaonkar
081ca6f085 fix: README
source additional .env for site operations
2020-04-27 14:38:33 +05:30
Revant Nandgaonkar
0361b281f9 fix: README
single command to deploy locally
env file placed where docker-compose will be executed
2020-04-27 13:36:33 +05:30
Revant Nandgaonkar
479ce83f5c fix: required region s3 compatible backup/restore 2020-04-26 22:48:35 +05:30
Revant Nandgaonkar
974f7dd74c
Merge pull request #195 from tbolender/sites-volume
Use Docker volumes for storing sites
2020-04-22 18:43:27 +05:30
Tim Bolender
b633ea05de Instruct usage of RDS 2020-04-22 11:11:15 +02:00
Tim Bolender
00165a240a Fixed command line volume usage 2020-04-22 10:53:37 +02:00
Tim Bolender
16cc6baf4c Use sites volume in all commands 2020-04-20 11:11:38 +02:00
Tim Bolender
3ed66d8333 Add volumes to container description 2020-04-20 11:05:51 +02:00
Davide Bortolami
5a66c1d5d0
Add travis badge 2020-04-19 01:18:21 +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
Tim Bolender
3772d580cc Remove obsolete instruction 2020-04-14 17:40:54 +02:00
Revant Nandgaonkar
362075a2bc fix: improve readme
mention to add site for production deployment
mention to start bench for development deployment

fixes #181
2020-04-10 14:26:00 +05:30
Revant Nandgaonkar
830d3959b7 docs: add info about backup command in readme 2020-03-30 13:08:55 +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
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
4e0d744591 fix: README(s)
INSTALL_APPS variable fix, previous failed
site_config has db info instead of common_site_config
2020-03-09 13:49:35 +05:30
Davide Bortolami
3ff3df0831 Grammar fixes 2020-03-08 20:29:17 +00:00
Davide Bortolami
3bf1fdcc75 Clean up main README, add development section 2020-03-08 20:17:39 +00:00
chabad360
7bdd329793 some small changes 2020-03-06 06:23:53 +00:00
chabad360
1c513f9e41 Merge remote-tracking branch 'upstream/develop' into install_app 2020-03-06 06:21:07 +00:00
chabad360
be8f0e4fa0 rudimentary docs 2020-03-06 06:12:11 +00:00
Revant Nandgaonkar
2f085ea234 fix: Improve README(s) 2020-03-06 06:45:54 +05:30
Davide Bortolami
71763673b8 merged documentation changes 2020-03-05 16:39:32 +00:00
chabad360
5cf8e68327 update docs for INSTALL_APPS 2020-03-05 02:00:54 +00:00
Chinmay D. Pai
b2f1bdcc27
chore: clean up and update readme
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-03-02 10:59:25 +05:30