From 9322e9771ed05d5610a38d4ef88c22b4bcde64a5 Mon Sep 17 00:00:00 2001 From: Chuck Lantz Date: Wed, 11 Dec 2019 05:18:22 +0000 Subject: [PATCH 1/3] Updates for 1.41 --- .devcontainer/Dockerfile | 56 +++++++++++++++++++++++--------- .devcontainer/devcontainer.json | 23 ++++++------- .devcontainer/maven-settings.xml | 6 ++++ README.md | 15 ++++++--- 4 files changed, 68 insertions(+), 32 deletions(-) create mode 100644 .devcontainer/maven-settings.xml diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 0703fc9..64e99a9 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,37 +1,61 @@ -#----------------------------------------------------------------------------------------- +#------------------------------------------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See LICENSE in the project root for license information. -#----------------------------------------------------------------------------------------- +# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information. +#------------------------------------------------------------------------------------------------------------- -FROM maven:3.6-jdk-8 +FROM mcr.microsoft.com/java/jdk:8u232-zulu-ubuntu -# Or your actual UID, GID on Linux if not the default 1000 +# Avoid warnings by switching to noninteractive +ENV DEBIAN_FRONTEND=noninteractive + +# 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 -# Configure apt -ENV DEBIAN_FRONTEND=noninteractive +# Maven settings +ARG MAVEN_VERSION=3.6.1 +ARG MAVEN_SHA=b4880fb7a3d81edd190a029440cdf17f308621af68475a4fe976296e71ff4a4b546dd6d8a58aaafba334d309cc11e638c52808a4b0e818fc0fd544226d952544 +ENV MAVEN_HOME=/usr/local/share/maven +COPY maven-settings.xml ${MAVEN_HOME}/ref/ + +# Configure apt and install packages RUN apt-get update \ && apt-get -y install --no-install-recommends apt-utils dialog 2>&1 \ # - # Install git, process tools, lsb-release (common in install instructions for CLIs) - && apt-get -y install git procps lsb-release \ - # - # Allow for a consistant java home location for settings - image is changing over time - && if [ ! -d "/docker-java-home" ]; then ln -s "${JAVA_HOME}" /docker-java-home; fi \ + # Verify git and needed tools are installed + && apt-get -y install \ + git \ + iproute2 \ + procps \ + curl \ + apt-transport-https \ + gnupg2 \ + lsb-release \ # # Create a non-root user to use if preferred - see https://aka.ms/vscode-remote/containers/non-root-user. && groupadd --gid $USER_GID $USERNAME \ - && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ - # [Optional] Add sudo support for non-root user + && useradd -s /bin/bash --uid ${USER_UID} --gid ${USER_GID} -m $USERNAME \ + # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ + # + # Install Maven + && mkdir -p ${MAVEN_HOME} ${MAVEN_HOME}/ref \ + && curl -fsSL -o /tmp/apache-maven.tar.gz https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz \ + && echo "${MAVEN_SHA} /tmp/apache-maven.tar.gz" | sha512sum -c - \ + && tar -xzf /tmp/apache-maven.tar.gz -C ${MAVEN_HOME} --strip-components=1 \ + && rm -f /tmp/apache-maven.tar.gz \ + && ln -s ${MAVEN_HOME}/bin/mvn /usr/local/bin/mvn \ # # Clean up && apt-get autoremove -y \ && apt-get clean -y \ && rm -rf /var/lib/apt/lists/* -ENV DEBIAN_FRONTEND= +# Switch back to dialog for any ad-hoc use of apt-get +ENV DEBIAN_FRONTEND=dialog \ No newline at end of file diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index ea75d75..6eca1b6 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,26 +1,27 @@ { "name": "Java Sample", "dockerFile": "Dockerfile", - - // Comment out the next line to run as root instead. Linux users, - // update Dockerfile with your user's UID/GID if not 1000. - "runArgs": ["-u", "vscode"], // Use 'settings' to set *default* container specific settings.json values on container create. // You can edit these settings after create using File > Preferences > Settings > Remote. - "settings":{ - "java.home": "/docker-java-home", - "terminal.integrated.shell.linux": "/bin/bash" + "settings": { + "terminal.integrated.shell.linux": "/bin/bash", + "java.home": "/usr/lib/jvm/zulu-8-azure-amd64" }, - // Uncomment the next line if you want to publish any ports. + // Use 'appPort' to create a container with published ports. If the port isn't working, be sure + // your server accepts connections from all interfaces (0.0.0.0 or '*'), not just localhost. // "appPort": [], // Uncomment the next line to run commands after the container is created. // "postCreateCommand": "java -version", + // Comment out the next line to run as root + "remoteUser": "vscode", + + // Add the IDs of extensions you want installed when the container is created in the array below. "extensions": [ - "vscjava.vscode-java-pack", - "redhat.vscode-xml" + "ms-azuretools.vscode-azurefunctions", + "vscjava.vscode-java-pack" ] -} +} \ No newline at end of file diff --git a/.devcontainer/maven-settings.xml b/.devcontainer/maven-settings.xml new file mode 100644 index 0000000..50439ab --- /dev/null +++ b/.devcontainer/maven-settings.xml @@ -0,0 +1,6 @@ + + /usr/share/maven/ref/repository + \ No newline at end of file diff --git a/README.md b/README.md index 1a3ae67..5a51348 100644 --- a/README.md +++ b/README.md @@ -10,18 +10,23 @@ Follow these steps to open this sample in a container: 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). -2. **Linux users:** Update `USER_UID` and `USER_GID` in `.devcontainer/Dockerfile` with your user UID/GID if not 1000 to avoid creating files as root. +2. To use this repository, you can either open a locally cloned copy of the code: -3. If you're not yet in a development container: - - Clone this repository. + - Clone this repository to your local filesystem. - Press F1 and select the **Remote-Containers: Open Folder in Container...** command. - Select the cloned copy of this folder, wait for the container to start, and try things out! + Or open the repository in an isolated Docker volume: + + - Press F1 and select the **Remote-Containers: Try a Sample...** command. + - Choose the "Node" sample, wait for the container to start and try things out! + > **Note:** Under the hood, this will use **Remote-Containers: Open Repository in Container...** command to clone the source code in a Docker volume instead of the local filesystem. + ## Things to try -Once you have this sample opened in a container, you'll be able to work with it like you would locally. +Once you have this sample opened in a container, you'll be able to work with it like you would locally. -> **Note:** This container runs as a non-root user with sudo access by default. Comment out `"-u", "vscode"` in `.devcontainer/devcontainer.json` if you'd prefer to run as root. +> **Note:** This container runs as a non-root user with sudo access by default. Comment out `"remoteUser": "node"` in `.devcontainer/devcontainer.json` if you'd prefer to run as root. Some things to try: From f85f67c166390c78ccef53ee7e1eb1896810e306 Mon Sep 17 00:00:00 2001 From: Chuck Lantz Date: Wed, 11 Dec 2019 05:19:21 +0000 Subject: [PATCH 2/3] Tweak --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5a51348..cd9c38c 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Follow these steps to open this sample in a container: Once you have this sample opened in a container, you'll be able to work with it like you would locally. -> **Note:** This container runs as a non-root user with sudo access by default. Comment out `"remoteUser": "node"` in `.devcontainer/devcontainer.json` if you'd prefer to run as root. +> **Note:** This container runs as a non-root user with sudo access by default. Comment out `"remoteUser": "vscode"` in `.devcontainer/devcontainer.json` if you'd prefer to run as root. Some things to try: From f5ceeccc827b2f0d0835a62e4527f23447cd05ac Mon Sep 17 00:00:00 2001 From: Chuck Lantz Date: Thu, 12 Dec 2019 07:59:46 -0800 Subject: [PATCH 3/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cd9c38c..2741938 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Follow these steps to open this sample in a container: Or open the repository in an isolated Docker volume: - Press F1 and select the **Remote-Containers: Try a Sample...** command. - - Choose the "Node" sample, wait for the container to start and try things out! + - Choose the "Java" sample, wait for the container to start and try things out! > **Note:** Under the hood, this will use **Remote-Containers: Open Repository in Container...** command to clone the source code in a Docker volume instead of the local filesystem. ## Things to try