From 6eb365cdd4b156d98c99a4f3071833bc7bd9712e Mon Sep 17 00:00:00 2001
From: George Arama <50641385+gearama@users.noreply.github.com>
Date: Fri, 10 Sep 2021 15:55:33 -0700
Subject: [PATCH] Devcontainer (#2861)

* final

* ytryrt

* Update .devcontainer/devcontainer.json

Co-authored-by: Victor Vazquez <victor.vazquez@microsoft.com>

Co-authored-by: Victor Vazquez <victor.vazquez@microsoft.com>
---
 .devcontainer/Dockerfile        | 57 +++++++++++++++++++++------------
 .devcontainer/devcontainer.json | 50 ++++++++++++++++++-----------
 2 files changed, 67 insertions(+), 40 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 1e31518c9..222779e5a 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -16,27 +16,36 @@ USER root
 RUN apt-get update \
     && export DEBIAN_FRONTEND=noninteractive \
     && LANG=C LC_ALL=C apt-get -y install --no-install-recommends \
-        apt-utils \
-        dialog \
-        sudo \
-        #
-        # Install vim, git, process tools, lsb-release
-        git \
-        openssh-client \
-        less \
-        #
-        # Azure SDK for C++ dev env
-        make \
-        cmake \
-        build-essential \
-        zlib1g-dev \
-        libcurl4-openssl-dev \
-        libssl-dev \
-        libxml2-dev \
-        # clang format 10 req
-        gnupg2 \
-        wget \
-        ca-certificates \
+    apt-utils \
+    dialog \
+    sudo \
+    #
+    # Install vim, git, process tools, lsb-release
+    git \
+    openssh-client \
+    less \
+    #
+    # Azure SDK for C++ dev env
+    make \
+    cmake \
+    ninja-build \
+    build-essential \
+    zlib1g-dev \
+    libcurl4-openssl-dev \
+    libssl-dev \
+    libxml2-dev \
+    gdb \
+    # clang format 10 req
+    gnupg2 \
+    wget \
+    ca-certificates \
+    # vcpkg reqs
+    curl \
+    zip \
+    unzip \
+    tar \
+    pkg-config \
+
     #
     # Add en_US.UTF-8 locale
     && echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen \
@@ -59,5 +68,11 @@ RUN apt-get update \
     && apt-get clean -y \
     && rm -rf /var/lib/apt/lists/*
 
+RUN cd / \
+    && git clone https://github.com/microsoft/vcpkg.git \
+    && cd vcpkg \
+    && ./bootstrap-vcpkg.sh \
+    && ./vcpkg install curl 
+
 # Switch back to the non-root user
 USER ${USERNAME}
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 0dd126a6d..dbfa1099a 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,20 +1,32 @@
-{
-    "name": "Ubuntu-21.04",
-    "dockerFile": "Dockerfile",
-    "settings": { 
-        "terminal.integrated.shell.linux": "/bin/bash"
-    },
-    "extensions": [
-		"ms-vscode.cpptools-themes",
-		"bbenoist.doxygen",
-		"streetsidesoftware.code-spell-checker",
-		"ms-vscode.cpptools",
-		"xaver.clang-format",
-		"twxs.cmake",
-		"ms-vscode.cmake-tools",
-		"eamodio.gitlens",
-		"davidschuldenfrei.gtest-adapter"
-	],
-    // Do not run as root. See https://aka.ms/vscode-remote/containers/non-root.
-    "remoteUser": "azure-sdk-for-cpp"
+{
+  "name": "Ubuntu-20.04.VCPKG",
+  "dockerFile": "Dockerfile",
+  "settings": {
+    "terminal.integrated.shell.linux": "/bin/bash"
+  },
+  "extensions": [
+    "ms-vscode.cpptools-themes",
+    "bbenoist.doxygen",
+    "streetsidesoftware.code-spell-checker",
+    "ms-vscode.cpptools",
+    "xaver.clang-format",
+    "twxs.cmake",
+    "ms-vscode.cmake-tools",
+    "eamodio.gitlens",
+    "davidschuldenfrei.gtest-adapter"
+  ],
+  // Do not run as root. See https://aka.ms/vscode-remote/containers/non-root.
+  "remoteUser": "azure-sdk-for-cpp",
+  "containerEnv": {
+    "AZURE_CLIENT_ID": "",
+    "AZURE_CLIENT_SECRET": "",
+    "AZURE_KEYVAULT_HSM_URL": "",
+    "AZURE_KEYVAULT_URL": "",
+    "AZURE_LOG_LEVEL": "1",
+    "AZURE_TENANT_ID": "",
+    "AZURE_TEST_MODE": "PLAYBACK",
+    "CLIENT_OBJECTID": "",
+    // set or unset to run using vcpkg or not
+    "VCPKG_ROOT": "/vcpkg"
+  }
 }