mirror of
https://github.com/frappe/frappe_docker.git
synced 2026-06-26 09:05:10 +00:00
Migliorato file configurazione docker
This commit is contained in:
parent
a6ba63cc4a
commit
8843b6ee76
6 changed files with 14 additions and 9 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -8,6 +8,7 @@ sites
|
||||||
|
|
||||||
development
|
development
|
||||||
!development/README.md
|
!development/README.md
|
||||||
|
!development/frappe-bench/apps/erpnext/*
|
||||||
deploy_key
|
deploy_key
|
||||||
deploy_key.pub
|
deploy_key.pub
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,8 @@ services:
|
||||||
environment:
|
environment:
|
||||||
- MYSQL_ROOT_PASSWORD=123
|
- MYSQL_ROOT_PASSWORD=123
|
||||||
- MYSQL_USER=root
|
- MYSQL_USER=root
|
||||||
|
ports:
|
||||||
|
- "3306:3306"
|
||||||
volumes:
|
volumes:
|
||||||
- ../installation/frappe-mariadb.cnf:/etc/mysql/conf.d/frappe.cnf
|
- ../installation/frappe-mariadb.cnf:/etc/mysql/conf.d/frappe.cnf
|
||||||
- mariadb-vol:/var/lib/mysql
|
- mariadb-vol:/var/lib/mysql
|
||||||
|
|
|
||||||
10
development/.vscode/launch.json
vendored
10
development/.vscode/launch.json
vendored
|
|
@ -12,7 +12,7 @@
|
||||||
"args": [
|
"args": [
|
||||||
"frappe", "serve", "--port", "8000", "--noreload", "--nothreading"
|
"frappe", "serve", "--port", "8000", "--noreload", "--nothreading"
|
||||||
],
|
],
|
||||||
"pythonPath": "${workspaceFolder}/frappe-bench/env/bin/python",
|
"python": "${workspaceFolder}/frappe-bench/env/bin/python",
|
||||||
"cwd": "${workspaceFolder}/frappe-bench/sites",
|
"cwd": "${workspaceFolder}/frappe-bench/sites",
|
||||||
"env": {
|
"env": {
|
||||||
"DEV_SERVER": "1"
|
"DEV_SERVER": "1"
|
||||||
|
|
@ -26,7 +26,7 @@
|
||||||
"args": [
|
"args": [
|
||||||
"frappe", "worker", "--queue", "default"
|
"frappe", "worker", "--queue", "default"
|
||||||
],
|
],
|
||||||
"pythonPath": "${workspaceFolder}/frappe-bench/env/bin/python",
|
"python": "${workspaceFolder}/frappe-bench/env/bin/python",
|
||||||
"cwd": "${workspaceFolder}/frappe-bench/sites",
|
"cwd": "${workspaceFolder}/frappe-bench/sites",
|
||||||
"env": {
|
"env": {
|
||||||
"DEV_SERVER": "1"
|
"DEV_SERVER": "1"
|
||||||
|
|
@ -40,7 +40,7 @@
|
||||||
"args": [
|
"args": [
|
||||||
"frappe", "worker", "--queue", "short"
|
"frappe", "worker", "--queue", "short"
|
||||||
],
|
],
|
||||||
"pythonPath": "${workspaceFolder}/frappe-bench/env/bin/python",
|
"python": "${workspaceFolder}/frappe-bench/env/bin/python",
|
||||||
"cwd": "${workspaceFolder}/frappe-bench/sites",
|
"cwd": "${workspaceFolder}/frappe-bench/sites",
|
||||||
"env": {
|
"env": {
|
||||||
"DEV_SERVER": "1"
|
"DEV_SERVER": "1"
|
||||||
|
|
@ -54,7 +54,7 @@
|
||||||
"args": [
|
"args": [
|
||||||
"frappe", "worker", "--queue", "long"
|
"frappe", "worker", "--queue", "long"
|
||||||
],
|
],
|
||||||
"pythonPath": "${workspaceFolder}/frappe-bench/env/bin/python",
|
"python": "${workspaceFolder}/frappe-bench/env/bin/python",
|
||||||
"cwd": "${workspaceFolder}/frappe-bench/sites",
|
"cwd": "${workspaceFolder}/frappe-bench/sites",
|
||||||
"env": {
|
"env": {
|
||||||
"DEV_SERVER": "1"
|
"DEV_SERVER": "1"
|
||||||
|
|
@ -64,7 +64,7 @@
|
||||||
"name": "Honcho SocketIO Watch Schedule Worker",
|
"name": "Honcho SocketIO Watch Schedule Worker",
|
||||||
"type": "python",
|
"type": "python",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
"pythonPath": "/usr/bin/python3",
|
"python": "/usr/bin/python3",
|
||||||
"program": "/home/frappe/.local/bin/honcho",
|
"program": "/home/frappe/.local/bin/honcho",
|
||||||
"cwd": "${workspaceFolder}/frappe-bench",
|
"cwd": "${workspaceFolder}/frappe-bench",
|
||||||
"console": "internalConsole",
|
"console": "internalConsole",
|
||||||
|
|
|
||||||
|
|
@ -136,6 +136,8 @@ services:
|
||||||
restart: on-failure
|
restart: on-failure
|
||||||
environment:
|
environment:
|
||||||
- MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
|
- MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
|
||||||
|
ports:
|
||||||
|
- "3306:3306"
|
||||||
volumes:
|
volumes:
|
||||||
- ./installation/frappe-mariadb.cnf:/etc/mysql/conf.d/frappe.cnf
|
- ./installation/frappe-mariadb.cnf:/etc/mysql/conf.d/frappe.cnf
|
||||||
- mariadb-vol:/var/lib/mysql
|
- mariadb-vol:/var/lib/mysql
|
||||||
|
|
|
||||||
|
|
@ -2,9 +2,9 @@ LETSENCRYPT_EMAIL=email@example.com
|
||||||
ERPNEXT_VERSION=edge
|
ERPNEXT_VERSION=edge
|
||||||
FRAPPE_VERSION=edge
|
FRAPPE_VERSION=edge
|
||||||
MARIADB_HOST=mariadb
|
MARIADB_HOST=mariadb
|
||||||
MYSQL_ROOT_PASSWORD=admin
|
MYSQL_ROOT_PASSWORD=123
|
||||||
SITE_NAME=mysite.localhost
|
SITE_NAME=erpnext.localhost
|
||||||
SITES=`mysite.localhost`
|
SITES=`erpnext.localhost`
|
||||||
DB_ROOT_USER=root
|
DB_ROOT_USER=root
|
||||||
ADMIN_PASSWORD=admin
|
ADMIN_PASSWORD=admin
|
||||||
INSTALL_APPS=erpnext
|
INSTALL_APPS=erpnext
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ LETSENCRYPT_EMAIL=email@example.com
|
||||||
ERPNEXT_VERSION=edge
|
ERPNEXT_VERSION=edge
|
||||||
FRAPPE_VERSION=edge
|
FRAPPE_VERSION=edge
|
||||||
MARIADB_HOST=mariadb
|
MARIADB_HOST=mariadb
|
||||||
MYSQL_ROOT_PASSWORD=admin
|
MYSQL_ROOT_PASSWORD=123
|
||||||
SITE_NAME=erp.example.com
|
SITE_NAME=erp.example.com
|
||||||
SITES=`erp.example.com`
|
SITES=`erp.example.com`
|
||||||
DB_ROOT_USER=root
|
DB_ROOT_USER=root
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue