diff --git a/.devcontainer/devcontainer.example.json b/.devcontainer/devcontainer.example.json index 4be22f7..57e8f8d 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 0000000..fd5da25 --- /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 06eccb5..e215d35 100644 --- a/.gitignore +++ b/.gitignore @@ -15,5 +15,6 @@ /.devcontainer/* !/.devcontainer/devcontainer.example.json +!/.devcontainer/docker-compose.extend-example.yml .DS_Store