Merge branch 'main' of github.com:container-labs/terraform-github-terraform-repo into main

WillBeebe · WillBeebe · commit acdd6ce83463 · 2021-02-18T02:17:39.000-08:00
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,2 +1 @@
-# TODO: create a devcontainer base image
-FROM us-central1-docker.pkg.dev/containerlabs/devcontainer/terraform:14
+FROM us-central1-docker.pkg.dev/containerlabs/gitpod/terraform:7ca0caa370af
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -5,10 +5,6 @@
   ],
   "dockerFile": "Dockerfile",
   "settings": {
-      "terminal.integrated.shell.linux": "/usr/bin/zsh",
-      "files.exclude": {
-          "**/CODE_OF_CONDUCT.md": true,
-          "**/LICENSE": true
-      }
+      "terminal.integrated.shell.linux": "/usr/bin/zsh"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-# TODO: create a devcontainer base image`
`2`		`-FROM us-central1-docker.pkg.dev/containerlabs/devcontainer/terraform:14`
	`1`	`+FROM us-central1-docker.pkg.dev/containerlabs/gitpod/terraform:7ca0caa370af`
Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,6 @@`
`5`	`5`	`],`
`6`	`6`	`"dockerFile": "Dockerfile",`
`7`	`7`	`"settings": {`
`8`		`- "terminal.integrated.shell.linux": "/usr/bin/zsh",`
`9`		`- "files.exclude": {`
`10`		`- "**/CODE_OF_CONDUCT.md": true,`
`11`		`- "**/LICENSE": true`
`12`		`- }`
	`8`	`+ "terminal.integrated.shell.linux": "/usr/bin/zsh"`
`13`	`9`	`}`
`14`	`10`	`}`