Merge pull request #23 from Microsoft/clantz/azure-fn-revamp

Revamp Azure Functions Dev Container Definitions

containers/azure-functions-dotnetcore-2.1/.devcontainer/Dockerfile

@@ -5,18 +5,30 @@
 
 FROM mcr.microsoft.com/dotnet/core/sdk:2.1
 
-# Install git, process tools, bash
-RUN apt-get update && apt-get -y install git procps
+# Configure apt
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update \
+    && apt-get -y install --no-install-recommends apt-utils 2>&1
+
+# Verify git and needed tools are installed
+RUN apt-get -y install \
+        git \
+        procps \
+        curl \
+        apt-transport-https \
+        gnupg2 \
+        lsb-release
 
 # Install Azure Functions and Azure CLI
-RUN apt-get install -y apt-transport-https curl gnupg2 lsb-release \
-    && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/azure-cli.list \
+RUN echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/azure-cli.list \
     && echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-debian-$(lsb_release -cs)-prod $(lsb_release -cs) main" > /etc/apt/sources.list.d/dotnetdev.list \
-    && curl -L https://packages.microsoft.com/keys/microsoft.asc | apt-key add - 2>/dev/null \
+    && curl -sL https://packages.microsoft.com/keys/microsoft.asc | (OUT=$(apt-key add - 2>&1) || echo $OUT) \
     && apt-get update \
     && apt-get install -y azure-cli azure-functions-core-tools
-    
+
 # Clean up
 RUN apt-get autoremove -y \
     && apt-get clean -y \
     && rm -rf /var/lib/apt/lists/*
+ENV DEBIAN_FRONTEND=dialog
+

containers/azure-functions-dotnetcore-2.1/README.md

@@ -30,6 +30,29 @@ This definition requires an Azure subscription to use. You can create a [free ac
 
 5. Finally, press <kbd>F1</kbd> and run **Remote-Containers: Reopen Folder in Container** to start using the definition.
 
+## Testing the definition
+
+This definition includes some test code that will help you verify it is working as expected on your system. Follow these steps:
+
+1. If this is your first time using a development container, please follow the [getting started steps](https://aka.ms/vscode-remote/containers/getting-started) to set up your machine.
+2. Clone this repository.
+3. Start VS Code, press <kbd>F1</kbd>, and select **Remote-Containers: Open Folder in Container...**
+4. Select the `containers/azure-functions-dotnetcore-2.1` folder.
+5. After the folder has opened in the container, press <kbd>F1</kbd> and select **Azure Functions: Create Function...**.
+6. Enter these options:
+   1. Yes (when prompted to create a new project)
+   2. C#
+   3. HTTP Trigger
+   4. HttpTriggerCSharp
+   5. Anonymous
+   6. Open in current window
+7. After the files are added, in a moment you will see a notification to restore packages. Click "Restore".
+8. After the restore has completed, press <kbd>F5</kbd> to start debugging project.
+9. After the debugger is started, open a local browser and enter the URL: `http://localhost:7071/api/HttpTriggerCSharp?name=remote`.
+    - If the port 7071 is not already open, press <kbd>F1</kbd>, select **Remote-Containers: Forward Port from Container...**, and then port 7071.
+10. You should see "Hello, remote" echoed by the Azure Function.
+11. From here, you can add breakpoints or edit the contents of the `test-project` folder to do further testing.
+
 ## License
 
 Copyright (c) Microsoft Corporation. All rights reserved.

containers/azure-functions-dotnetcore-latest/.devcontainer/Dockerfile

@@ -5,18 +5,29 @@
 
 FROM mcr.microsoft.com/dotnet/core/sdk:latest
 
-# Install git, process tools, bash
-RUN apt-get update && apt-get -y install git procps
+# Configure apt
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update \
+    && apt-get -y install --no-install-recommends apt-utils 2>&1
+
+# Verify git and needed tools are installed
+RUN apt-get -y install \
+        git \
+        procps \
+        curl \
+        apt-transport-https \
+        gnupg2 \
+        lsb-release
 
 # Install Azure Functions and Azure CLI
-RUN apt-get install -y apt-transport-https curl gnupg2 lsb-release \
-    && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/azure-cli.list \
+RUN echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/azure-cli.list \
     && echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-debian-$(lsb_release -cs)-prod $(lsb_release -cs) main" > /etc/apt/sources.list.d/dotnetdev.list \
-    && curl -L https://packages.microsoft.com/keys/microsoft.asc | apt-key add - 2>/dev/null \
+    && curl -sL https://packages.microsoft.com/keys/microsoft.asc | (OUT=$(apt-key add - 2>&1) || echo $OUT) \
     && apt-get update \
     && apt-get install -y azure-cli azure-functions-core-tools
 
 # Clean up
 RUN apt-get autoremove -y \
     && apt-get clean -y \
     && rm -rf /var/lib/apt/lists/*
+ENV DEBIAN_FRONTEND=dialog

containers/azure-functions-dotnetcore-latest/README.md

@@ -30,6 +30,29 @@ This definition requires an Azure subscription to use. You can create a [free ac
 
 5. Finally, press <kbd>F1</kbd> and run **Remote-Containers: Reopen Folder in Container** to start using the definition.
 
+## Testing the definition
+
+This definition includes some test code that will help you verify it is working as expected on your system. Follow these steps:
+
+1. If this is your first time using a development container, please follow the [getting started steps](https://aka.ms/vscode-remote/containers/getting-started) to set up your machine.
+2. Clone this repository.
+3. Start VS Code, press <kbd>F1</kbd>, and select **Remote-Containers: Open Folder in Container...**
+4. Select the `containers/azure-functions-dotnetcore-latest` folder.
+5. After the folder has opened in the container, press <kbd>F1</kbd> and select **Azure Functions: Create Function...**.
+6. Enter these options:
+   1. Yes (when prompted to create a new project)
+   2. C#
+   3. HTTP Trigger
+   4. HttpTriggerCSharp
+   5. Anonymous
+   6. Open in current window
+7. After the files are added, in a moment you will see a notification to restore packages. Click "Restore".
+8. After the restore has completed, press <kbd>F5</kbd> to start debugging project.
+9. After the debugger is started, open a local browser and enter the URL: `http://localhost:7071/api/HttpTriggerCSharp?name=remote`.
+    - If the port 7071 is not already open, press <kbd>F1</kbd>, select **Remote-Containers: Forward Port from Container...**, and then port 7071.
+10. You should see "Hello, remote" echoed by the Azure Function.
+11. From here, you can add breakpoints or edit the contents of the `test-project` folder to do further testing.
+
 ## License
 
 Copyright (c) Microsoft Corporation. All rights reserved.

containers/azure-functions-java-8/.devcontainer/Dockerfile

@@ -22,48 +22,12 @@ RUN apt-get -y install \
         gnupg2 \
         lsb-release
 
-# Install dotnet core sdk - See https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/stretch/amd64/Dockerfile
-# Install .NET CLI dependencies
-RUN apt-get install -y --no-install-recommends \
-        libc6 \
-        libgcc1 \
-        libgssapi-krb5-2 \
-        libicu57 \
-        liblttng-ust0 \
-        libssl1.0.2 \
-        libstdc++6 \
-        zlib1g
-
-# Install .NET Core SDK
-ENV DOTNET_SDK_VERSION 2.1.603
-
-RUN curl -SL --output dotnet.tar.gz https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-x64.tar.gz \
-    && dotnet_sha512='dd0efb8aae75d8f48ef3abbeca38ae14d2621a47e37b2d9d74755b58f9173343305f1a62cfa9a03f17c42f58b1d1b653d271e7d1327c81ff4af0a54c43c7db59' \
-    && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \
-    && mkdir -p /usr/share/dotnet \
-    && tar -zxf dotnet.tar.gz -C /usr/share/dotnet \
-    && rm dotnet.tar.gz \
-    && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
-
-# Configure web servers to bind to port 80 when present
-ENV ASPNETCORE_URLS=http://+:80 \
-    # Enable detection of running in a container
-    DOTNET_RUNNING_IN_CONTAINER=true \
-    # Enable correct mode for dotnet watch (only mode supported in a container)
-    DOTNET_USE_POLLING_FILE_WATCHER=true \
-    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
-    NUGET_XMLDOC_MODE=skip
-
-# Trigger first run experience by running arbitrary cmd to populate local package cache
-RUN dotnet help &> /dev/null
-
-
-# Install Azure Functions and Azure CLI
+# Install Azure Functions, .NET Core, and Azure CLI
 RUN echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/azure-cli.list \
     && echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-debian-$(lsb_release -cs)-prod $(lsb_release -cs) main" > /etc/apt/sources.list.d/dotnetdev.list \
-    && curl -sL https://packages.microsoft.com/keys/microsoft.asc | apt-key add - 2>/dev/null \
+    && curl -sL https://packages.microsoft.com/keys/microsoft.asc | (OUT=$(apt-key add - 2>&1) || echo $OUT) \
     && apt-get update \
-    && apt-get install -y azure-cli azure-functions-core-tools
+    && apt-get install -y azure-cli dotnet-sdk-2.1 azure-functions-core-tools
 
 # Clean up
 RUN apt-get autoremove -y \

containers/azure-functions-java-8/README.md

@@ -38,9 +38,19 @@ This definition includes some test code that will help you verify it is working
 2. Clone this repository.
 3. Start VS Code, press <kbd>F1</kbd>, and select **Remote-Containers: Open Folder in Container...**
 4. Select the `containers/azure-functions-java-8` folder.
-5. After the folder has opened in the container, press <kbd>F5</kbd> to start the project.
-6. After the debugger is started, type `curl http://localhost:7071/api/HttpTrigger-Java?name=test` in the terminal, you should see "Hello, test" echoed by the Azure Function.
-7. From here, you can add breakpoints or edit the contents of the `test-project` folder to do further testing.
+5. After the folder has opened in the container, press <kbd>F1</kbd> and select **Azure Functions: Create Function...**.
+6. Enter these options:
+   1. Yes (when prompted to create a new project)
+   2. Java
+   3. HTTP Trigger
+   4. HTTPTrigger-Java
+   5. Anonymous
+   6. Open in current window
+7. Press <kbd>F5</kbd> to start debugging project.
+8. After the debugger is started, open a local browser and enter the URL: `http://localhost:7071/api/HttpTrigger-Java?name=remote`.
+    - If the port 7071 is not already open, press <kbd>F1</kbd>, select **Remote-Containers: Forward Port from Container...**, and then port 7071.
+9. You should see "Hello, remote" echoed by the Azure Function.
+10. From here, you can add breakpoints or edit the contents of the `test-project` folder to do further testing.
 
 ## License