From 88d06bb8387111da7c5e5f4e180663237890fa0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?La=C3=A9rcio=20de=20Sousa?=
 <laerciosousa@sme-mogidascruzes.sp.gov.br>
Date: Fri, 6 Dec 2019 13:50:32 -0300
Subject: [PATCH] Complete sample configuration for VSCode Remote Development
 on Containers

---
 .devcontainer/devcontainer.example.json         | 12 ++++++++++--
 .devcontainer/docker-compose.extend-example.yml |  6 ++++++
 .gitignore                                      |  1 +
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 .devcontainer/docker-compose.extend-example.yml

diff --git a/.devcontainer/devcontainer.example.json b/.devcontainer/devcontainer.example.json
index 4be22f7f..57e8f8d0 100644
--- a/.devcontainer/devcontainer.example.json
+++ b/.devcontainer/devcontainer.example.json
@@ -1,7 +1,15 @@
 {
   "name": "Laradock",
-  "dockerComposeFile": ["../docker-compose.yml"],
-  "runServices": ["nginx", "postgres", "pgadmin"],
+  "dockerComposeFile": [
+    "../docker-compose.yml",
+    "docker-compose.extend.yml"
+  ],
+  "remoteUser": "laradock",
+  "runServices": [
+    "nginx",
+    "postgres",
+    "pgadmin"
+  ],
   "service": "workspace",
   "workspaceFolder": "/var/www",
   "shutdownAction": "stopCompose",
diff --git a/.devcontainer/docker-compose.extend-example.yml b/.devcontainer/docker-compose.extend-example.yml
new file mode 100644
index 00000000..fd5da259
--- /dev/null
+++ b/.devcontainer/docker-compose.extend-example.yml
@@ -0,0 +1,6 @@
+version: '3'
+services:
+  workspace:
+    volumes:
+      - ~/.gitconfig:/home/laradock/.gitconfig
+      - ~/.ssh:/home/laradock/.ssh:ro
diff --git a/.gitignore b/.gitignore
index 06eccb52..e215d357 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,5 +15,6 @@
 
 /.devcontainer/*
 !/.devcontainer/devcontainer.example.json
+!/.devcontainer/docker-compose.extend-example.yml
 
 .DS_Store