From 8843b6ee7652781498b6094487d264f91b0e2519 Mon Sep 17 00:00:00 2001 From: GraficheAquilane2021 Date: Mon, 18 Jan 2021 17:22:52 +0100 Subject: [PATCH] Migliorato file configurazione docker --- .gitignore | 1 + devcontainer-example/docker-compose.yml | 2 ++ development/.vscode/launch.json | 10 +++++----- docker-compose.yml | 2 ++ env-local | 6 +++--- env-production | 2 +- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index e6ae4965..b3ec5418 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ sites development !development/README.md +!development/frappe-bench/apps/erpnext/* deploy_key deploy_key.pub diff --git a/devcontainer-example/docker-compose.yml b/devcontainer-example/docker-compose.yml index c46f21ca..2c5111a6 100644 --- a/devcontainer-example/docker-compose.yml +++ b/devcontainer-example/docker-compose.yml @@ -5,6 +5,8 @@ services: environment: - MYSQL_ROOT_PASSWORD=123 - MYSQL_USER=root + ports: + - "3306:3306" volumes: - ../installation/frappe-mariadb.cnf:/etc/mysql/conf.d/frappe.cnf - mariadb-vol:/var/lib/mysql diff --git a/development/.vscode/launch.json b/development/.vscode/launch.json index efdc0903..029cd5e8 100644 --- a/development/.vscode/launch.json +++ b/development/.vscode/launch.json @@ -12,7 +12,7 @@ "args": [ "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", "env": { "DEV_SERVER": "1" @@ -26,7 +26,7 @@ "args": [ "frappe", "worker", "--queue", "default" ], - "pythonPath": "${workspaceFolder}/frappe-bench/env/bin/python", + "python": "${workspaceFolder}/frappe-bench/env/bin/python", "cwd": "${workspaceFolder}/frappe-bench/sites", "env": { "DEV_SERVER": "1" @@ -40,7 +40,7 @@ "args": [ "frappe", "worker", "--queue", "short" ], - "pythonPath": "${workspaceFolder}/frappe-bench/env/bin/python", + "python": "${workspaceFolder}/frappe-bench/env/bin/python", "cwd": "${workspaceFolder}/frappe-bench/sites", "env": { "DEV_SERVER": "1" @@ -54,7 +54,7 @@ "args": [ "frappe", "worker", "--queue", "long" ], - "pythonPath": "${workspaceFolder}/frappe-bench/env/bin/python", + "python": "${workspaceFolder}/frappe-bench/env/bin/python", "cwd": "${workspaceFolder}/frappe-bench/sites", "env": { "DEV_SERVER": "1" @@ -64,7 +64,7 @@ "name": "Honcho SocketIO Watch Schedule Worker", "type": "python", "request": "launch", - "pythonPath": "/usr/bin/python3", + "python": "/usr/bin/python3", "program": "/home/frappe/.local/bin/honcho", "cwd": "${workspaceFolder}/frappe-bench", "console": "internalConsole", diff --git a/docker-compose.yml b/docker-compose.yml index 87d72377..9d357535 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -136,6 +136,8 @@ services: restart: on-failure environment: - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + ports: + - "3306:3306" volumes: - ./installation/frappe-mariadb.cnf:/etc/mysql/conf.d/frappe.cnf - mariadb-vol:/var/lib/mysql diff --git a/env-local b/env-local index 2b331a22..440f8978 100644 --- a/env-local +++ b/env-local @@ -2,9 +2,9 @@ LETSENCRYPT_EMAIL=email@example.com ERPNEXT_VERSION=edge FRAPPE_VERSION=edge MARIADB_HOST=mariadb -MYSQL_ROOT_PASSWORD=admin -SITE_NAME=mysite.localhost -SITES=`mysite.localhost` +MYSQL_ROOT_PASSWORD=123 +SITE_NAME=erpnext.localhost +SITES=`erpnext.localhost` DB_ROOT_USER=root ADMIN_PASSWORD=admin INSTALL_APPS=erpnext diff --git a/env-production b/env-production index 2ac0e75c..04d72975 100644 --- a/env-production +++ b/env-production @@ -2,7 +2,7 @@ LETSENCRYPT_EMAIL=email@example.com ERPNEXT_VERSION=edge FRAPPE_VERSION=edge MARIADB_HOST=mariadb -MYSQL_ROOT_PASSWORD=admin +MYSQL_ROOT_PASSWORD=123 SITE_NAME=erp.example.com SITES=`erp.example.com` DB_ROOT_USER=root