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

90 Commits

Author SHA1 Message Date
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
Suraj Shetty
7ddcae41c5
fix(Readme): Typo 2020-01-23 13:21:47 +05:30
chabad360
acee24b577 refactor: dockerfile
* testing replacement for dbench

* fixed perm issue and added docker control

* fixes and tests

fixed travis test, and perm issue

* auto add permissions

* bench setup anything-else should work now

* removed adding site names to host (its pointless)

* moved redis configuration folder into conf/

* added a docker down feature to dbench and changed some of the docs

* hopefully should fix the args issue

* Condensed Dockerfile

Updated to latest node, and uses python-pip, also condensed a lot the Dockerfile.

* Removed extra line

* Removed MAINTAINER in favor of LABEL

* all installs are in one apt command

* Switch bench to dbench, added -s feature of dbench to bench. updated
Docker file with sudo and vim, and setup travis to run with said changes

* dockerfile: clean up (#52)

* Condensed Dockerfile

Updated to latest node, and uses python-pip, also condensed a lot the Dockerfile.

* fixed travis, and cleaned up dbench a little

* Oops...

* oops, but only for travis, this runs fine

* Travis!

* added help to dbench, and updated readme

* changes some of the wording of the help message

* dbench: fix init issues (#55)

./dbench init would lead to 'missing argument: PATH' issue (#54), and could not find Procfile_docker and site-config.

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>

* bench setup anything-else should work now

* Clean cache to get a smaller image (#57)

Please include this commit to decrease the size of the docker image, the "rm -rf /var/lib/apt/lists/*" it is not usefull if it is not used in the same stage of the apt-get install RUN, similar with pip cache.

References:
 - https://linux.die.net/man/8/apt-get
 - https://stackoverflow.com/questions/9510474/removing-pips-cache
 - https://semaphoreci.com/blog/2016/12/13/lightweight-docker-images-in-5-steps.html

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
have the right to submit it under the open source license
indicated in the file;

(b) I understand and agree that this project and the contribution
are public and that a record of the contribution (including all
personal information I submit with it, including my sign-off) is
maintained indefinitely and may be redistributed consistent with
this project or the open source license(s) involved.

Signed-off-by: William Moreno Reyes <williamjmorenor@gmail.com>

* removed adding site names to host (its pointless)

* moved redis configuration folder into conf/

* added a docker down feature to dbench and changed some of the docs

* Changed the readme significantly

 Please enter the commit message for your changes. Lines starting

* changed test.py to avoid naming errors

* moving some things around for less lines

* some more slight name changes

* added a .gitignore

* added the frappe folder again

* added a .dockerignore and fixed the dockerfile up a bit

* Updating travis' docker and compose

 This is the commit message #3:

* bringing chown in dbench back

* some refractoring

* implementing codacy sugestions

* moving some things around

* Updating dbench in some areas

* some random changes and fixes

* dockerfile refactoring

* Refractoring, reducing layers

* removing the py script that took too many lines to do one simple thing

* Fixed up the readme

* some refractoring

* moving to debian slim and refractoring

* adding some logging

* Updated travis to ubuntu xenial, should fix the curl issue

* manually building curl, cause we cant use  the latest version...

* maybe we dont need it

* changing the url to curl

* trying this instead

* lets just let it pollute the stream

* please pollute!

* some last bits of refractoring

* some refractoring

* fixed a few issues and did some refractoring

* needed an excuse to get travis to build

* adding in some changes learnt from seibert-media/erpnext-docker

* that should fix that

* where did that "h" come from?

* fix that...

* maybe that

* please work...

* try that for locales

* dont know what that's doing there

* so it didn't work...

* lets try doing locales like this

* forgot the -y...

* trying it this way

* and if we dont remove it?

* what about like this?

* small change

* small change

* I wonder...

* some small refractoring

* saving some time

* bring that back

* fix the smallie
2019-11-02 11:17:38 +05:30
Matteo D
4e7dd47d0e Fixed some typos (#65) 2019-06-17 00:12:32 +05:30
chabad360
33ad0c4fe9 refactor(frappe-docker): code cleanup and fixes (#63)
* testing replacement for dbench

* fixed perm issue and added docker control

* fixes and tests

fixed travis test, and perm issue

* auto add permissions

* bench setup anything-else should work now

* removed adding site names to host (its pointless)

* moved redis configuration folder into conf/

* added a docker down feature to dbench and changed some of the docs

* hopefully should fix the args issue

* Condensed Dockerfile

Updated to latest node, and uses python-pip, also condensed a lot the Dockerfile.

* Removed extra line

* Removed MAINTAINER in favor of LABEL

* all installs are in one apt command

* Switch bench to dbench, added -s feature of dbench to bench. updated
Docker file with sudo and vim, and setup travis to run with said changes

* dockerfile: clean up (#52)

* Condensed Dockerfile

Updated to latest node, and uses python-pip, also condensed a lot the Dockerfile.

* fixed travis, and cleaned up dbench a little

* Oops...

* oops, but only for travis, this runs fine

* Travis!

* added help to dbench, and updated readme

* changes some of the wording of the help message

* dbench: fix init issues (#55)

./dbench init would lead to 'missing argument: PATH' issue (#54), and could not find Procfile_docker and site-config.

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>

* bench setup anything-else should work now

* Clean cache to get a smaller image (#57)

Please include this commit to decrease the size of the docker image, the "rm -rf /var/lib/apt/lists/*" it is not usefull if it is not used in the same stage of the apt-get install RUN, similar with pip cache.

References:
 - https://linux.die.net/man/8/apt-get
 - https://stackoverflow.com/questions/9510474/removing-pips-cache
 - https://semaphoreci.com/blog/2016/12/13/lightweight-docker-images-in-5-steps.html

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
have the right to submit it under the open source license
indicated in the file;

(b) I understand and agree that this project and the contribution
are public and that a record of the contribution (including all
personal information I submit with it, including my sign-off) is
maintained indefinitely and may be redistributed consistent with
this project or the open source license(s) involved.

Signed-off-by: William Moreno Reyes <williamjmorenor@gmail.com>

* removed adding site names to host (its pointless)

* moved redis configuration folder into conf/

* added a docker down feature to dbench and changed some of the docs

* Changed the readme significantly

 Please enter the commit message for your changes. Lines starting

* changed test.py to avoid naming errors

* moving some things around for less lines

* some more slight name changes

* added a .gitignore

* added the frappe folder again

* added a .dockerignore and fixed the dockerfile up a bit

* Updating travis' docker and compose

 This is the commit message #3:

* bringing chown in dbench back

* some refractoring

* implementing codacy sugestions

* moving some things around

* Updating dbench in some areas

* some random changes and fixes

* dockerfile refactoring

* Refractoring, reducing layers

* removing the py script that took too many lines to do one simple thing

* Fixed up the readme

* some refractoring

* moving to debian slim and refractoring

* adding some logging

* Updated travis to ubuntu xenial, should fix the curl issue

* manually building curl, cause we cant use  the latest version...

* maybe we dont need it

* changing the url to curl

* trying this instead

* lets just let it pollute the stream

* please pollute!
2019-04-06 01:20:30 +05:30
chabad360
2b1334d5a5 improvements to travis and dbench (#53)
This PR adds the `bench` script, which aims for near parity with frappe bench, it makes setting up far easier, because instead of running `./dbench -c "new-site site1.local"` you only white what you would if bench was installed on the local system (i.e. `./bench new-site site1.local`), it also adds other features as well.
2018-10-13 03:05:29 +00:00
reilly3000
720b76f4d2
Updated README.md to clarify initial admin password
it took me a long time to way to login after initially installing. I eventually found out the default by looking into closed issues on github. I just added a line to the readme to make it clear for future users to get up and running faster.
2018-05-04 10:54:30 -07:00
vishalseshagiri
c2e45caba3
Merge pull request #22 from frappe/develop
Updated README.md
2017-11-27 14:10:50 +05:30
vishalseshagiri
e2415aa832
Updated README.md
- added dbench init to the README
- moved usage commands to wiki
2017-11-27 14:09:12 +05:30