From 8a3710c6ae2a1c6ed6e5d10bb2a13ee27f4abfb6 Mon Sep 17 00:00:00 2001
From: bhack <bhack@users.noreply.github.com>
Date: Tue, 26 May 2020 14:51:31 +0200
Subject: [PATCH 01/23] Add tensorflow-addons support

---
 .../addons/.devcontainer/Dockerfile           | 42 +++++++++++++++++++
 .../addons/.devcontainer/devcontainer.json    | 32 ++++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100644 repository-containers/github.com/tensorflow/addons/.devcontainer/Dockerfile
 create mode 100644 repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json

diff --git a/repository-containers/github.com/tensorflow/addons/.devcontainer/Dockerfile b/repository-containers/github.com/tensorflow/addons/.devcontainer/Dockerfile
new file mode 100644
index 0000000000..0a2d30f5e5
--- /dev/null
+++ b/repository-containers/github.com/tensorflow/addons/.devcontainer/Dockerfile
@@ -0,0 +1,42 @@
+#-------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
+#-------------------------------------------------------------------------------------------------------------
+
+FROM tfaddons/tensorflow:2.1.0-custom-op-gpu-ubuntu16-minimal
+
+# This Dockerfile adds a non-root user with sudo access. Use the "remoteUser"
+# property in devcontainer.json to use it. On Linux, the container user's GID/UIDs
+# will be updated to match your local UID/GID (when using the dockerFile property).
+# See https://aka.ms/vscode-remote/containers/non-root-user for details.
+ARG USERNAME=vscode
+ARG USER_UID=1000
+ARG USER_GID=$USER_UID
+
+# Options for common package install script - SHA updated on release
+ARG INSTALL_ZSH="false"
+ARG UPGRADE_PACKAGES="true"
+ARG COMMON_SCRIPT_SOURCE="https://raw.githubusercontent.com/microsoft/vscode-dev-containers/master/script-library/common-debian.sh"
+ARG COMMON_SCRIPT_SHA="dev-mode"
+
+# Configure apt and install packages
+RUN apt-get update \
+    && export DEBIAN_FRONTEND=noninteractive \
+    #
+    # Verify git, common tools / libs installed, add/modify non-root user, optionally install zsh
+    && apt-get -y install --no-install-recommends curl ca-certificates 2>&1 \
+    && curl -sSL  ${COMMON_SCRIPT_SOURCE} -o /tmp/common-setup.sh \
+    && ([ "${COMMON_SCRIPT_SHA}" = "dev-mode" ] || (echo "${COMMON_SCRIPT_SHA} */tmp/common-setup.sh" | sha256sum -c -)) \
+    && /bin/bash /tmp/common-setup.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
+    && rm /tmp/common-setup.sh \
+    #
+    # *********************************************************************
+    # * Uncomment this section to use RUN to install other dependencies.  *
+    # * See https://aka.ms/vscode-remote/containers/dockerfile-run        *
+    # *********************************************************************
+    # && apt-get -y install --no-install-recommends <your-package-list-here>
+    #
+    # Clean up
+    && apt-get autoremove -y \
+    && apt-get clean -y \
+    && rm -rf /var/lib/apt/lists/*
\ No newline at end of file
diff --git a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
new file mode 100644
index 0000000000..cb58f1f69c
--- /dev/null
+++ b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
@@ -0,0 +1,32 @@
+
+{
+	"name": "Tensorflow Addons SIG Dev Container",
+
+	"dockerFile": "Dockerfile",
+
+	// Set *default* container specific settings.json values on container create.
+	"settings": { 
+		"terminal.integrated.shell.linux": null
+	},
+
+	// Add the IDs of extensions you want installed when the container is created.
+	"extensions": [  
+        "ms-python.python",
+        "ms-vscode.cpptools"
+    ],
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "uname -a",
+
+	// Uncomment to use Docker from inside the container. See https://aka.ms/vscode-remote/samples/docker-in-docker.
+	// "mounts": [ "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind" ],
+
+	// Uncomment when using a ptrace-based debugger like C++, Go, and Rust
+	"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
+
+	// Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
+	"remoteUser": "vscode"
+}
\ No newline at end of file

From a6889115127a340e264db06bf93e41839ddae8e2 Mon Sep 17 00:00:00 2001
From: bhack <bhack@users.noreply.github.com>
Date: Tue, 26 May 2020 14:52:15 +0200
Subject: [PATCH 02/23] Remove space

---
 .../github.com/tensorflow/addons/.devcontainer/devcontainer.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
index cb58f1f69c..ab5a0e3b46 100644
--- a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
+++ b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
@@ -1,4 +1,3 @@
-
 {
 	"name": "Tensorflow Addons SIG Dev Container",
 

From f49fc17e9c9fe632bd1310148f8988242f98ccfd Mon Sep 17 00:00:00 2001
From: bhack <bhack@users.noreply.github.com>
Date: Tue, 26 May 2020 15:03:35 +0200
Subject: [PATCH 03/23] Change reference image

---
 .../github.com/tensorflow/addons/.devcontainer/Dockerfile       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/repository-containers/github.com/tensorflow/addons/.devcontainer/Dockerfile b/repository-containers/github.com/tensorflow/addons/.devcontainer/Dockerfile
index 0a2d30f5e5..1b33243d53 100644
--- a/repository-containers/github.com/tensorflow/addons/.devcontainer/Dockerfile
+++ b/repository-containers/github.com/tensorflow/addons/.devcontainer/Dockerfile
@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
 #-------------------------------------------------------------------------------------------------------------
 
-FROM tfaddons/tensorflow:2.1.0-custom-op-gpu-ubuntu16-minimal
+FROM tfaddons/dev_container:latest
 
 # This Dockerfile adds a non-root user with sudo access. Use the "remoteUser"
 # property in devcontainer.json to use it. On Linux, the container user's GID/UIDs

From d2f105e32c2f4d3cfe8704f8342751697acacd97 Mon Sep 17 00:00:00 2001
From: bhack <bhack@users.noreply.github.com>
Date: Tue, 26 May 2020 18:03:58 +0200
Subject: [PATCH 04/23] Set default provider to black

---
 .../tensorflow/addons/.devcontainer/devcontainer.json        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
index ab5a0e3b46..5eeb5a14e7 100644
--- a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
+++ b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
@@ -5,7 +5,8 @@
 
 	// Set *default* container specific settings.json values on container create.
 	"settings": { 
-		"terminal.integrated.shell.linux": null
+		"terminal.integrated.shell.linux": null,
+		"python.formatting.provider": "black"
 	},
 
 	// Add the IDs of extensions you want installed when the container is created.
@@ -28,4 +29,4 @@
 
 	// Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
 	"remoteUser": "vscode"
-}
\ No newline at end of file
+}

From 6c7c2d78d54ee340cdd323c68d70eb88f4152e88 Mon Sep 17 00:00:00 2001
From: bhack <bhack@users.noreply.github.com>
Date: Tue, 26 May 2020 18:24:35 +0200
Subject: [PATCH 05/23] Add clang_format fallbackStyle

---
 .../tensorflow/addons/.devcontainer/devcontainer.json          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
index 5eeb5a14e7..18815cdd1d 100644
--- a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
+++ b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
@@ -6,7 +6,8 @@
 	// Set *default* container specific settings.json values on container create.
 	"settings": { 
 		"terminal.integrated.shell.linux": null,
-		"python.formatting.provider": "black"
+		"python.formatting.provider": "black",
+		"C_Cpp.clang_format_fallbackStyle": "{BasedOnStyle: Google}"
 	},
 
 	// Add the IDs of extensions you want installed when the container is created.

From 35b86b65cfe7c77b345029082ddcfb5e88529cb3 Mon Sep 17 00:00:00 2001
From: bhack <bhack@users.noreply.github.com>
Date: Tue, 26 May 2020 19:22:23 +0200
Subject: [PATCH 06/23] Add Tensoflow header include path

---
 .../tensorflow/addons/.devcontainer/devcontainer.json         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
index 18815cdd1d..5b2a26a83f 100644
--- a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
+++ b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
@@ -8,6 +8,10 @@
 		"terminal.integrated.shell.linux": null,
 		"python.formatting.provider": "black",
 		"C_Cpp.clang_format_fallbackStyle": "{BasedOnStyle: Google}"
+		"C_Cpp.default.includePath": [
+			"${workspaceFolder}/**",
+			"/usr/local/lib/python3.6/dist-packages/tensorflow/include/"
+        	],
 	},
 
 	// Add the IDs of extensions you want installed when the container is created.

From 6d6e12c318bd137570aaa1929222166b63857e81 Mon Sep 17 00:00:00 2001
From: bhack <bhack@users.noreply.github.com>
Date: Wed, 27 May 2020 00:56:14 +0200
Subject: [PATCH 07/23] Fix setting key

---
 .../tensorflow/addons/.devcontainer/devcontainer.json           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
index 5b2a26a83f..7eecd8c271 100644
--- a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
+++ b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
@@ -7,7 +7,7 @@
 	"settings": { 
 		"terminal.integrated.shell.linux": null,
 		"python.formatting.provider": "black",
-		"C_Cpp.clang_format_fallbackStyle": "{BasedOnStyle: Google}"
+		"C_Cpp.clang_format_style": "{BasedOnStyle: Google}"
 		"C_Cpp.default.includePath": [
 			"${workspaceFolder}/**",
 			"/usr/local/lib/python3.6/dist-packages/tensorflow/include/"

From d9454899e7eda6a224adcd2e99256132df6c19f9 Mon Sep 17 00:00:00 2001
From: bhack <bhack@users.noreply.github.com>
Date: Wed, 27 May 2020 02:34:27 +0200
Subject: [PATCH 08/23] Set default update to false

---
 .../github.com/tensorflow/addons/.devcontainer/Dockerfile     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/repository-containers/github.com/tensorflow/addons/.devcontainer/Dockerfile b/repository-containers/github.com/tensorflow/addons/.devcontainer/Dockerfile
index 1b33243d53..93d906e131 100644
--- a/repository-containers/github.com/tensorflow/addons/.devcontainer/Dockerfile
+++ b/repository-containers/github.com/tensorflow/addons/.devcontainer/Dockerfile
@@ -15,7 +15,7 @@ ARG USER_GID=$USER_UID
 
 # Options for common package install script - SHA updated on release
 ARG INSTALL_ZSH="false"
-ARG UPGRADE_PACKAGES="true"
+ARG UPGRADE_PACKAGES="false"
 ARG COMMON_SCRIPT_SOURCE="https://raw.githubusercontent.com/microsoft/vscode-dev-containers/master/script-library/common-debian.sh"
 ARG COMMON_SCRIPT_SHA="dev-mode"
 
@@ -39,4 +39,4 @@ RUN apt-get update \
     # Clean up
     && apt-get autoremove -y \
     && apt-get clean -y \
-    && rm -rf /var/lib/apt/lists/*
\ No newline at end of file
+    && rm -rf /var/lib/apt/lists/*

From b2d788287909a65781f704ac659d0aeea8545894 Mon Sep 17 00:00:00 2001
From: bhack <bhack@users.noreply.github.com>
Date: Wed, 27 May 2020 14:15:02 +0200
Subject: [PATCH 09/23] Add missing coma

---
 .../tensorflow/addons/.devcontainer/devcontainer.json           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
index 7eecd8c271..1a56ece47d 100644
--- a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
+++ b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
@@ -7,7 +7,7 @@
 	"settings": { 
 		"terminal.integrated.shell.linux": null,
 		"python.formatting.provider": "black",
-		"C_Cpp.clang_format_style": "{BasedOnStyle: Google}"
+		"C_Cpp.clang_format_style": "{BasedOnStyle: Google}",
 		"C_Cpp.default.includePath": [
 			"${workspaceFolder}/**",
 			"/usr/local/lib/python3.6/dist-packages/tensorflow/include/"

From 34eb0c2abe48550b4ba0321490343e114553d62d Mon Sep 17 00:00:00 2001
From: bhack <bhack@users.noreply.github.com>
Date: Wed, 27 May 2020 15:58:08 +0200
Subject: [PATCH 10/23] Add optional nvidia support

---
 .../tensorflow/addons/.devcontainer/devcontainer.json          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
index 1a56ece47d..ca81bdbdeb 100644
--- a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
+++ b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
@@ -2,6 +2,9 @@
 	"name": "Tensorflow Addons SIG Dev Container",
 
 	"dockerFile": "Dockerfile",
+	
+    	// Uncomment this to enable Nvidia support
+	// "runArgs": ["--runtime=nvidia"],
 
 	// Set *default* container specific settings.json values on container create.
 	"settings": { 

From b7e505b3581ec46a14ea1138b48ffdb703391cb0 Mon Sep 17 00:00:00 2001
From: bhack <bhack@users.noreply.github.com>
Date: Wed, 27 May 2020 15:58:44 +0200
Subject: [PATCH 11/23] Fix comment

---
 .../tensorflow/addons/.devcontainer/devcontainer.json           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
index ca81bdbdeb..78c86cc721 100644
--- a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
+++ b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
@@ -3,7 +3,7 @@
 
 	"dockerFile": "Dockerfile",
 	
-    	// Uncomment this to enable Nvidia support
+    	// Uncomment to enable Nvidia support
 	// "runArgs": ["--runtime=nvidia"],
 
 	// Set *default* container specific settings.json values on container create.

From 32104ffb229efaa7a15a375417dc17d1cb835e71 Mon Sep 17 00:00:00 2001
From: bhack <bhack@users.noreply.github.com>
Date: Wed, 27 May 2020 19:50:20 +0200
Subject: [PATCH 12/23] Enable pytest

---
 .../github.com/tensorflow/addons/.devcontainer/devcontainer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
index 78c86cc721..b3827293b3 100644
--- a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
+++ b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
@@ -10,6 +10,7 @@
 	"settings": { 
 		"terminal.integrated.shell.linux": null,
 		"python.formatting.provider": "black",
+		"python.testing.pytestEnabled": true,
 		"C_Cpp.clang_format_style": "{BasedOnStyle: Google}",
 		"C_Cpp.default.includePath": [
 			"${workspaceFolder}/**",

From 6dff6e1ca23004132581625b6b272850118b8ff8 Mon Sep 17 00:00:00 2001
From: bhack <bhack@users.noreply.github.com>
Date: Thu, 28 May 2020 12:41:00 +0200
Subject: [PATCH 13/23] Disable pytest integration for bus

Disable pytest integration until upstream bugs are resolved
---
 .../tensorflow/addons/.devcontainer/devcontainer.json       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
index b3827293b3..460296d50e 100644
--- a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
+++ b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
@@ -10,7 +10,11 @@
 	"settings": { 
 		"terminal.integrated.shell.linux": null,
 		"python.formatting.provider": "black",
-		"python.testing.pytestEnabled": true,
+		// Before you uncomment python.testing.* check if these bugs are resolved
+		// https://github.com/microsoft/vscode-python/issues/8678
+		// https://github.com/microsoft/vscode-python/issues/9553
+		// "python.testing.pytestEnabled": true,
+		// "python.testing.cwd": "${workspaceFolder}/tensorflow_addons",
 		"C_Cpp.clang_format_style": "{BasedOnStyle: Google}",
 		"C_Cpp.default.includePath": [
 			"${workspaceFolder}/**",

From de0aa43e045c56794f3e1624bd37eb75cf30d41b Mon Sep 17 00:00:00 2001
From: bhack <bhack@users.noreply.github.com>
Date: Sat, 30 May 2020 17:24:42 +0200
Subject: [PATCH 14/23] Workaround with pytestyArgs

---
 .../tensorflow/addons/.devcontainer/devcontainer.json      | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
index 460296d50e..61b2a28c12 100644
--- a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
+++ b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
@@ -10,11 +10,8 @@
 	"settings": { 
 		"terminal.integrated.shell.linux": null,
 		"python.formatting.provider": "black",
-		// Before you uncomment python.testing.* check if these bugs are resolved
-		// https://github.com/microsoft/vscode-python/issues/8678
-		// https://github.com/microsoft/vscode-python/issues/9553
-		// "python.testing.pytestEnabled": true,
-		// "python.testing.cwd": "${workspaceFolder}/tensorflow_addons",
+		"python.testing.pytestEnabled": true,
+		"python.testing.pytestArgs": ["./tensorflow_addons"],
 		"C_Cpp.clang_format_style": "{BasedOnStyle: Google}",
 		"C_Cpp.default.includePath": [
 			"${workspaceFolder}/**",

From 981b3aee6b78b8ec9748e758e7c9ca557e4b8f5c Mon Sep 17 00:00:00 2001
From: bhack <bhack@users.noreply.github.com>
Date: Wed, 3 Jun 2020 20:17:51 +0200
Subject: [PATCH 15/23] Add build args CPU/GPU

---
 .../tensorflow/addons/.devcontainer/Dockerfile   |  3 ++-
 .../addons/.devcontainer/devcontainer.json       | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/repository-containers/github.com/tensorflow/addons/.devcontainer/Dockerfile b/repository-containers/github.com/tensorflow/addons/.devcontainer/Dockerfile
index 93d906e131..ca6a8b4356 100644
--- a/repository-containers/github.com/tensorflow/addons/.devcontainer/Dockerfile
+++ b/repository-containers/github.com/tensorflow/addons/.devcontainer/Dockerfile
@@ -3,7 +3,8 @@
 # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
 #-------------------------------------------------------------------------------------------------------------
 
-FROM tfaddons/dev_container:latest
+ARG IMAGE_TYPE=latest-cpu
+FROM tfaddons/dev_container:$IMAGE_TYPE
 
 # This Dockerfile adds a non-root user with sudo access. Use the "remoteUser"
 # property in devcontainer.json to use it. On Linux, the container user's GID/UIDs
diff --git a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
index 61b2a28c12..c753ff23f3 100644
--- a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
+++ b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
@@ -1,17 +1,27 @@
 {
 	"name": "Tensorflow Addons SIG Dev Container",
 
+	// Uncomment this for GPU image
+	// "build": { 
+	// 		"args": { 
+	//			"IMAGE_TYPE": "latest"
+	//		} 
+	//	},
+
 	"dockerFile": "Dockerfile",
 	
-    	// Uncomment to enable Nvidia support
+    // Uncomment to enable Nvidia support
 	// "runArgs": ["--runtime=nvidia"],
 
 	// Set *default* container specific settings.json values on container create.
 	"settings": { 
 		"terminal.integrated.shell.linux": null,
 		"python.formatting.provider": "black",
-		"python.testing.pytestEnabled": true,
-		"python.testing.pytestArgs": ["./tensorflow_addons"],
+		// Before you uncomment python.testing.* check if these bugs are resolved
+		// https://github.com/microsoft/vscode-python/issues/8678
+		// https://github.com/microsoft/vscode-python/issues/9553
+		// "python.testing.pytestEnabled": true,
+		// "python.testing.pytestArgs": ["./tensorflow_addons"],
 		"C_Cpp.clang_format_style": "{BasedOnStyle: Google}",
 		"C_Cpp.default.includePath": [
 			"${workspaceFolder}/**",

From f2c09350a40f329f3e5b782b454f33bb9c0daab7 Mon Sep 17 00:00:00 2001
From: bhack <bhack@users.noreply.github.com>
Date: Thu, 4 Jun 2020 11:50:59 +0200
Subject: [PATCH 16/23] Enable flake8 liniting

---
 .../github.com/tensorflow/addons/.devcontainer/devcontainer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
index c753ff23f3..af08d0e8aa 100644
--- a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
+++ b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
@@ -17,6 +17,7 @@
 	"settings": { 
 		"terminal.integrated.shell.linux": null,
 		"python.formatting.provider": "black",
+		"python.linting.flake8Enabled": true,
 		// Before you uncomment python.testing.* check if these bugs are resolved
 		// https://github.com/microsoft/vscode-python/issues/8678
 		// https://github.com/microsoft/vscode-python/issues/9553

From 4cf3caa7e70940d7a965f1636ef239489098cf78 Mon Sep 17 00:00:00 2001
From: bhack <bhack@users.noreply.github.com>
Date: Thu, 4 Jun 2020 18:55:48 +0200
Subject: [PATCH 17/23] Add commented bazel integration

---
 .../tensorflow/addons/.devcontainer/devcontainer.json         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
index af08d0e8aa..48b788eeff 100644
--- a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
+++ b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
@@ -31,7 +31,9 @@
 	},
 
 	// Add the IDs of extensions you want installed when the container is created.
-	"extensions": [  
+	"extensions": [
+	// Before you enable bazel integration check https://github.com/bazelbuild/bazel/issues/10226
+	//"BazelBuild.vscode-bazel",
         "ms-python.python",
         "ms-vscode.cpptools"
     ],

From 0f1da3fc4763a8f91e7905e1c464e7b4ede8b0d5 Mon Sep 17 00:00:00 2001
From: bhack <bhack@users.noreply.github.com>
Date: Fri, 5 Jun 2020 23:15:33 +0200
Subject: [PATCH 18/23] Move nvidia runArgs

---
 .../addons/.devcontainer/devcontainer.json          | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
index 48b788eeff..0ba0395903 100644
--- a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
+++ b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
@@ -10,9 +10,6 @@
 
 	"dockerFile": "Dockerfile",
 	
-    // Uncomment to enable Nvidia support
-	// "runArgs": ["--runtime=nvidia"],
-
 	// Set *default* container specific settings.json values on container create.
 	"settings": { 
 		"terminal.integrated.shell.linux": null,
@@ -36,7 +33,7 @@
 	//"BazelBuild.vscode-bazel",
         "ms-python.python",
         "ms-vscode.cpptools"
-    ],
+    	],
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [],
@@ -48,7 +45,13 @@
 	// "mounts": [ "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind" ],
 
 	// Uncomment when using a ptrace-based debugger like C++, Go, and Rust
-	"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
+	"runArgs": [ 
+		// Uncomment to enable Nvidia support
+		// "--runtime=nvidia"],
+		"--cap-add=SYS_PTRACE",
+		"--security-opt",
+		"seccomp=unconfined" 
+	],
 
 	// Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
 	"remoteUser": "vscode"

From 199eb09170c80284c78cedbf48de791503894ca2 Mon Sep 17 00:00:00 2001
From: bhack <bhack@users.noreply.github.com>
Date: Fri, 5 Jun 2020 23:16:54 +0200
Subject: [PATCH 19/23] Fix space

---
 .../tensorflow/addons/.devcontainer/devcontainer.json         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
index 0ba0395903..b3d3d8bada 100644
--- a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
+++ b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
@@ -3,10 +3,10 @@
 
 	// Uncomment this for GPU image
 	// "build": { 
-	// 		"args": { 
+	//		"args": { 
 	//			"IMAGE_TYPE": "latest"
 	//		} 
-	//	},
+	//},
 
 	"dockerFile": "Dockerfile",
 	

From aa727765c0cfc571a74bc0720d0cbe8516a7346f Mon Sep 17 00:00:00 2001
From: bhack <bhack@users.noreply.github.com>
Date: Mon, 8 Jun 2020 14:16:16 +0200
Subject: [PATCH 20/23] Change tensorflow log level for tests

---
 .../addons/.devcontainer/devcontainer.json    | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
index b3d3d8bada..50d40e04dc 100644
--- a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
+++ b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
@@ -10,16 +10,17 @@
 
 	"dockerFile": "Dockerfile",
 	
+	"remoteEnv": {
+		TF_CPP_MIN_LOG_LEVEL": "1"
+	},
+	
 	// Set *default* container specific settings.json values on container create.
 	"settings": { 
 		"terminal.integrated.shell.linux": null,
 		"python.formatting.provider": "black",
 		"python.linting.flake8Enabled": true,
-		// Before you uncomment python.testing.* check if these bugs are resolved
-		// https://github.com/microsoft/vscode-python/issues/8678
-		// https://github.com/microsoft/vscode-python/issues/9553
-		// "python.testing.pytestEnabled": true,
-		// "python.testing.pytestArgs": ["./tensorflow_addons"],
+		"python.testing.pytestEnabled": true,
+		"python.testing.pytestArgs": ["./tensorflow_addons"],
 		"C_Cpp.clang_format_style": "{BasedOnStyle: Google}",
 		"C_Cpp.default.includePath": [
 			"${workspaceFolder}/**",
@@ -29,10 +30,10 @@
 
 	// Add the IDs of extensions you want installed when the container is created.
 	"extensions": [
-	// Before you enable bazel integration check https://github.com/bazelbuild/bazel/issues/10226
-	//"BazelBuild.vscode-bazel",
-        "ms-python.python",
-        "ms-vscode.cpptools"
+		// Before you enable bazel integration check https://github.com/bazelbuild/bazel/issues/10226
+		//"BazelBuild.vscode-bazel",
+        	"ms-python.python",
+        	"ms-vscode.cpptools"
     	],
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
@@ -46,7 +47,7 @@
 
 	// Uncomment when using a ptrace-based debugger like C++, Go, and Rust
 	"runArgs": [ 
-		// Uncomment to enable Nvidia support
+		// Uncomment to enable Nvidia support for GPU images
 		// "--runtime=nvidia"],
 		"--cap-add=SYS_PTRACE",
 		"--security-opt",

From c8b83a08cae7b6104aa36a077f9d06d4f6ea9c27 Mon Sep 17 00:00:00 2001
From: bhack <bhack@users.noreply.github.com>
Date: Mon, 8 Jun 2020 14:20:06 +0200
Subject: [PATCH 21/23] Fix typo

---
 .../tensorflow/addons/.devcontainer/devcontainer.json           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
index 50d40e04dc..1cc2196a76 100644
--- a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
+++ b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
@@ -1,7 +1,7 @@
 {
 	"name": "Tensorflow Addons SIG Dev Container",
 
-	// Uncomment this for GPU image
+	// Uncomment this for GPU images
 	// "build": { 
 	//		"args": { 
 	//			"IMAGE_TYPE": "latest"

From 741bcea382947d29b44e9dde330bf433e936a8e4 Mon Sep 17 00:00:00 2001
From: bhack <bhack@users.noreply.github.com>
Date: Tue, 9 Jun 2020 00:49:08 +0200
Subject: [PATCH 22/23] Fix missiing "

---
 .../tensorflow/addons/.devcontainer/devcontainer.json           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
index 1cc2196a76..1146cc7a81 100644
--- a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
+++ b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
@@ -11,7 +11,7 @@
 	"dockerFile": "Dockerfile",
 	
 	"remoteEnv": {
-		TF_CPP_MIN_LOG_LEVEL": "1"
+		"TF_CPP_MIN_LOG_LEVEL": "1"
 	},
 	
 	// Set *default* container specific settings.json values on container create.

From 35e900b3467b3d19c38124da014cfac4da5cdf68 Mon Sep 17 00:00:00 2001
From: bhack <bhack@users.noreply.github.com>
Date: Tue, 9 Jun 2020 00:50:59 +0200
Subject: [PATCH 23/23] Remove unused settings

---
 .../addons/.devcontainer/devcontainer.json        | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
index 1146cc7a81..48be4d1152 100644
--- a/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
+++ b/repository-containers/github.com/tensorflow/addons/.devcontainer/devcontainer.json
@@ -6,7 +6,7 @@
 	//		"args": { 
 	//			"IMAGE_TYPE": "latest"
 	//		} 
-	//},
+	// },
 
 	"dockerFile": "Dockerfile",
 	
@@ -31,24 +31,15 @@
 	// Add the IDs of extensions you want installed when the container is created.
 	"extensions": [
 		// Before you enable bazel integration check https://github.com/bazelbuild/bazel/issues/10226
-		//"BazelBuild.vscode-bazel",
+		// "BazelBuild.vscode-bazel",
         	"ms-python.python",
         	"ms-vscode.cpptools"
     	],
 
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [],
-
-	// Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "uname -a",
-
-	// Uncomment to use Docker from inside the container. See https://aka.ms/vscode-remote/samples/docker-in-docker.
-	// "mounts": [ "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind" ],
-
 	// Uncomment when using a ptrace-based debugger like C++, Go, and Rust
 	"runArgs": [ 
 		// Uncomment to enable Nvidia support for GPU images
-		// "--runtime=nvidia"],
+		// "--runtime=nvidia",
 		"--cap-add=SYS_PTRACE",
 		"--security-opt",
 		"seccomp=unconfined"