From cea75486198b61ab6ec1a81c218934d0ff9dd182 Mon Sep 17 00:00:00 2001
From: Lev Vereshchagin <mail@vrslev.com>
Date: Fri, 17 Dec 2021 12:43:48 +0300
Subject: [PATCH] Move devcontainer settings to devcontainer.json

---
 devcontainer-example/devcontainer.json   |  3 ++-
 devcontainer-example/docker-compose.yml  | 21 ++++++++-------------
 development/vscode-example/settings.json |  3 ---
 3 files changed, 10 insertions(+), 17 deletions(-)
 delete mode 100644 development/vscode-example/settings.json

diff --git a/devcontainer-example/devcontainer.json b/devcontainer-example/devcontainer.json
index 0640f28b..e54fc138 100644
--- a/devcontainer-example/devcontainer.json
+++ b/devcontainer-example/devcontainer.json
@@ -3,7 +3,8 @@
   "appPort": [8000, 9000, 6787],
   "remoteUser": "frappe",
   "settings": {
-    "terminal.integrated.shell.linux": "/bin/bash"
+    "terminal.integrated.shell.linux": "/bin/bash",
+    "debug.node.autoAttach": "disabled"
   },
   "dockerComposeFile": "./docker-compose.yml",
   "service": "frappe",
diff --git a/devcontainer-example/docker-compose.yml b/devcontainer-example/docker-compose.yml
index 66c171b2..42efdc3f 100644
--- a/devcontainer-example/docker-compose.yml
+++ b/devcontainer-example/docker-compose.yml
@@ -8,22 +8,17 @@ services:
       - --skip-character-set-client-handshake
       - --skip-innodb-read-only-compressed # Temporary fix for MariaDB 10.6
     environment:
-      - MYSQL_ROOT_PASSWORD=123
-      - MYSQL_USER=root
-      # Sometimes db initialization takes longer than 10 seconds and site-creator goes away.
-      # Frappe doesn't use CONVERT_TZ() function that requires time zone info, so we can just skip it.
-      - MYSQL_INITDB_SKIP_TZINFO=1
+      MYSQL_ROOT_PASSWORD: 123
     volumes:
-      - mariadb-vol:/var/lib/mysql
+      - mariadb-data:/var/lib/mysql
 
   # Enable PostgreSQL only if you use it, see development/README.md for more information.
   # postgresql:
   #   image: postgres:11.8
-  #   restart: on-failure
   #   environment:
-  #     - POSTGRES_PASSWORD=123
+  #     POSTGRES_PASSWORD: 123
   #   volumes:
-  #     - postgresql-vol:/var/lib/postgresql/data
+  #     - postgresql-data:/var/lib/postgresql/data
 
   redis-cache:
     image: redis:alpine
@@ -43,9 +38,9 @@ services:
       - ..:/workspace:cached
     working_dir: /workspace/development
     ports:
-      - "8000-8005:8000-8005"
-      - "9000-9005:9000-9005"
+      - 8000-8005:8000-8005
+      - 9000-9005:9000-9005
 
 volumes:
-  mariadb-vol:
-  postgresql-vol:
+  mariadb-data:
+  postgresql-data:
diff --git a/development/vscode-example/settings.json b/development/vscode-example/settings.json
deleted file mode 100644
index e5d9441c..00000000
--- a/development/vscode-example/settings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "debug.node.autoAttach": "disabled"
-}