2
0
mirror of https://github.com/frappe/frappe_docker.git synced 2024-11-10 15:20:55 +00:00
Commit Graph

31 Commits

Author SHA1 Message Date
Lev
7c157aa487
refactor: Dockerfiles (#555)
* refactor(frappe-worker): Dockerfile

* fix(frappe-worker): Cloning frappe repo

* refactor(frappe-nginx): Dockerfile

* refactor(erpnext-nginx): Dockerfile

* chore(frappe-worker): Add space in Dockerfile

* refactor(bench): Dockerfile

* refactor(frappe-socketio): Dockerfile

* ci(Test): Add `workflow_dispatch` trigger

* fix(bench): Uncomment missing package

* fix(bench): Replace legacy `libmariadbclient-dev` with `libmariadb-dev`

* refactor(erpnext-nginx): Install script

- Remove repetitive code
- Don't explicitly install production deps (they are installed via plain `yarn` with dev deps)
- Don't write to lockfiles

* fix(erpnext-nginx): use -e flag, fix installation

* fix(erpnext-nginx): Don't install unused wget

* fix(frappe-nginx): Get newest certificates

* fix: Install ca-certificates on erpnext-nginx instead of frappe-nginx

* trigger ci

* ci(test): Fix trigger duplicate

* chore: Fix linting
2021-11-10 04:43:46 +05:30
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
a4c115f96d build: Update Python from 3.7 to 3.9; Debian from 10 to 11 2021-11-03 16:48:01 +03:00
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
Revant Nandgaonkar
46920dd0be feat: allow custom frappe branch during asset image build 2021-06-08 16:37:07 +05:30
Revant Nandgaonkar
c6da8a1d98 feat: improve and upgrade build
use nodejs v14
allow build args to pass repo and branch
2021-05-21 14:30:55 +05:30
Revant Nandgaonkar
e8f590db3d fix(erpnext-nginx): install erpnext or custom app dependencies 2021-02-21 07:38:18 +05:30
Revant Nandgaonkar
c90783d6be feat: make images arm64 compatible 2021-01-08 17:45:22 +05:30
Revant Nandgaonkar
77b9eda567
Revert "feat: make images arm64 compatible" 2021-01-07 19:44:40 +05:30
Revant Nandgaonkar
8d2c139fc6 ci: use docker buildx in travis 2021-01-07 19:37:46 +05:30
Revant Nandgaonkar
117de9d4b8 fix(erpnext-nginx): COPY path for install_app.sh 2021-01-05 17:48:11 +05:30
Revant Nandgaonkar
4f904fe3b9 feat: make images arm64 compatible 2021-01-05 14:47:01 +05:30
everyx
39aff8627b fix: install app failed when APP_NAME is not same as the one contained in APP_REPO 2020-11-24 19:23:54 +08:00
Revant Nandgaonkar
f77a9bbe66 fix(erpnext-nginx): add node-sass as production dependency 2020-09-02 22:13:50 +05:30
Revant Nandgaonkar
dbd56ee99b fix(erpnext-nginx): remove unused docker-entrypoint script
fixes #321
2020-08-02 19:22:35 +05:30
Revant Nandgaonkar
84fefb2283 refactor: add utils and constants 2020-07-10 23:15:36 +05:30
Revant Nandgaonkar
87558b7f0d feat: add postgres support to frappe-worker 2020-06-29 23:28:10 +05:30
Revant Nandgaonkar
f5071122ed fix: erpnext image build
improve travis.py
python packages not installed in editable mode
use venv module instead of virtualenv
2020-06-28 05:55:15 +05:30
Revant Nandgaonkar
18e8f05c9f fix: erpnext image build errors 2020-06-28 00:22:23 +05:30
Revant Nandgaonkar
7106124a07 refactor: reuse Dockerfile(s) 2020-06-27 23:44:13 +05:30
Revant Nandgaonkar
05cb6a4596 build v13-beta images 2020-05-02 00:21:56 +05:30
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
Revant Nandgaonkar
f1393c3a94 fix(frappe-nginx): fix missing /rsync
fixes #160
2020-03-20 05:21:30 +05:30
Revant Nandgaonkar
1db512d334 fix: travis wrapper script for build on master
third attempt to get builds on master running
2020-03-17 00:14:16 +05:30
Revant Nandgaonkar
0f03713e5c fix: erpnext nginx image install_app script 2020-03-07 16:45:53 +05:30
Revant Nandgaonkar
e5a5a05dfb fix: erpnext nginx image build 2020-03-07 15:47:50 +05:30
Revant Nandgaonkar
d00770e42f fix: install_app set branch 2020-03-07 05:33:32 +05:30
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
Revant Nandgaonkar
6782decfc6 fix: resolve travis yml conflicts
use travis.py
2020-03-05 12:05:32 +05:30
Davide Bortolami
6f7a9b92ac Refactor renaming erpnext-assets and frappe-assets to erpnext-nginx and frappe-nginx 2020-03-03 23:40:11 +00:00