From 5c8e5bd6e2a07533c5b91ca86334a7e42ea79e1f Mon Sep 17 00:00:00 2001 From: Chuck Lantz Date: Wed, 11 Dec 2019 05:03:16 +0000 Subject: [PATCH] Updates for 1.41 --- .devcontainer/Dockerfile | 42 ++++++++++++++++----------------- .devcontainer/devcontainer.json | 19 +++++++-------- .gitignore | 1 + README.md | 13 ++++++---- 4 files changed, 38 insertions(+), 37 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 2aab164..faee1b7 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -8,7 +8,10 @@ FROM golang:1 # Avoid warnings by switching to noninteractive ENV DEBIAN_FRONTEND=noninteractive -# Or your actual UID, GID on Linux if not the default 1000 +# 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 @@ -18,25 +21,10 @@ RUN apt-get update \ && apt-get -y install --no-install-recommends apt-utils dialog 2>&1 \ # # Verify git, process tools, lsb-release (common in install instructions for CLIs) installed - && apt-get -y install git procps lsb-release \ + && apt-get -y install git iproute2 procps 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 - && apt-get install -y sudo \ - && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \ - && chmod 0440 /etc/sudoers.d/$USERNAME \ - # - # Clean up - && apt-get autoremove -y \ - && apt-get clean -y \ - && rm -rf /var/lib/apt/lists/* - -USER $USERNAME - -# Install gocode-gomod -RUN go get -x -d github.com/stamblerre/gocode 2>&1 \ + # Install gocode-gomod + && go get -x -d github.com/stamblerre/gocode 2>&1 \ && go build -o gocode-gomod github.com/stamblerre/gocode \ && mv gocode-gomod $GOPATH/bin/ \ # @@ -66,8 +54,18 @@ RUN go get -x -d github.com/stamblerre/gocode 2>&1 \ github.com/mgechev/revive \ github.com/derekparker/delve/cmd/dlv 2>&1 \ # + # 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 + && apt-get install -y sudo \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \ + && chmod 0440 /etc/sudoers.d/$USERNAME \ + # # Clean up - && rm -rf /go/src + && apt-get autoremove -y \ + && apt-get clean -y \ + && rm -rf /var/lib/apt/lists/* /go/src -# Uncomment the line below if you are using go modules -# ENV GO111MODULE=on \ No newline at end of file +# Switch back to dialog for any ad-hoc use of apt-get +ENV DEBIAN_FRONTEND=dialog diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 8a2ccb6..dff0840 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,19 +1,12 @@ { - "name": "Go", + "name": "Go Sample", "dockerFile": "Dockerfile", + "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ], - // Specifies a list of ports the container should publish + // 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": [9000], - "runArgs": [ - // Uncomment the next line to run as root instead. Linux users, - // update Dockerfile with your user's UID/GID if not 1000 when - // using the default "vscode" user. - // "-u", "root", - - "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" - ], - // 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": { @@ -26,6 +19,10 @@ // Uncomment the next line to run commands after the container is created. // "postCreateCommand": "go 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": [ "ms-vscode.go" ] diff --git a/.gitignore b/.gitignore index 194d2e2..d121356 100644 --- a/.gitignore +++ b/.gitignore @@ -332,4 +332,5 @@ ASALocalRun/ *.DS_Store out +pkg debug diff --git a/README.md b/README.md index 07a6cbc..551e36a 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. -> **Note:** This container runs as a non-root user with sudo access by default. Uncomment `"-u", "root"` 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: