Update to use latest definition
This commit is contained in:
		@@ -1,65 +1,18 @@
 | 
			
		||||
# Update the VARIANT arg in devcontainer.json to pick an Go version
 | 
			
		||||
ARG VARIANT=1
 | 
			
		||||
FROM golang:${VARIANT}
 | 
			
		||||
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.137.0/containers/go/.devcontainer/base.Dockerfile
 | 
			
		||||
ARG VARIANT="1"
 | 
			
		||||
FROM mcr.microsoft.com/vscode/devcontainers/go:0-${VARIANT}
 | 
			
		||||
 | 
			
		||||
# Options for setup script
 | 
			
		||||
ARG INSTALL_ZSH="true"
 | 
			
		||||
ARG UPGRADE_PACKAGES="false"
 | 
			
		||||
ARG USERNAME=vscode
 | 
			
		||||
ARG USER_UID=1000
 | 
			
		||||
ARG USER_GID=$USER_UID
 | 
			
		||||
# [Optional] Install a version of Node.js using nvm for front end dev
 | 
			
		||||
ARG INSTALL_NODE="true"
 | 
			
		||||
ARG NODE_VERSION="lts/*"
 | 
			
		||||
RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "source /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
 | 
			
		||||
 | 
			
		||||
# Install needed packages and setup non-root user. Use a separate RUN statement to add your own dependencies.
 | 
			
		||||
COPY library-scripts/*.sh /tmp/library-scripts/
 | 
			
		||||
RUN apt-get update \
 | 
			
		||||
    && /bin/bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
 | 
			
		||||
    && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts
 | 
			
		||||
 | 
			
		||||
# Install Go tools
 | 
			
		||||
ARG GO_TOOLS_WITH_MODULES="\
 | 
			
		||||
    golang.org/x/tools/gopls \
 | 
			
		||||
    honnef.co/go/tools/... \
 | 
			
		||||
    golang.org/x/tools/cmd/gorename \
 | 
			
		||||
    golang.org/x/tools/cmd/goimports \
 | 
			
		||||
    golang.org/x/tools/cmd/guru \
 | 
			
		||||
    golang.org/x/lint/golint \
 | 
			
		||||
    github.com/mdempsky/gocode \
 | 
			
		||||
    github.com/cweill/gotests/... \
 | 
			
		||||
    github.com/haya14busa/goplay/cmd/goplay \
 | 
			
		||||
    github.com/sqs/goreturns \
 | 
			
		||||
    github.com/josharian/impl \
 | 
			
		||||
    github.com/davidrjenni/reftools/cmd/fillstruct \
 | 
			
		||||
    github.com/uudashr/gopkgs/v2/cmd/gopkgs \
 | 
			
		||||
    github.com/ramya-rao-a/go-outline \
 | 
			
		||||
    github.com/acroca/go-symbols \
 | 
			
		||||
    github.com/godoctor/godoctor \
 | 
			
		||||
    github.com/rogpeppe/godef \
 | 
			
		||||
    github.com/zmb3/gogetdoc \
 | 
			
		||||
    github.com/fatih/gomodifytags \
 | 
			
		||||
    github.com/mgechev/revive \
 | 
			
		||||
    github.com/go-delve/delve/cmd/dlv"
 | 
			
		||||
RUN mkdir -p /tmp/gotools \
 | 
			
		||||
    && cd /tmp/gotools \
 | 
			
		||||
    && export GOPATH=/tmp/gotools \
 | 
			
		||||
    # Go tools w/module support
 | 
			
		||||
    && export GO111MODULE=on \
 | 
			
		||||
    && (echo "${GO_TOOLS_WITH_MODULES}" | xargs -n 1 go get -x )2>&1 \
 | 
			
		||||
    # gocode-gomod
 | 
			
		||||
    && export GO111MODULE=auto \
 | 
			
		||||
    && go get -x -d github.com/stamblerre/gocode 2>&1 \
 | 
			
		||||
    && go build -o gocode-gomod github.com/stamblerre/gocode \
 | 
			
		||||
    # golangci-lint
 | 
			
		||||
    && curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b /usr/local/bin 2>&1 \
 | 
			
		||||
    # Move Go tools into path and clean up
 | 
			
		||||
    && mv /tmp/gotools/bin/* /usr/local/bin/ \
 | 
			
		||||
    && mv gocode-gomod /usr/local/bin/ \
 | 
			
		||||
    && rm -rf /tmp/gotools
 | 
			
		||||
 | 
			
		||||
ENV GO111MODULE=auto
 | 
			
		||||
# [Optional] Uncomment this section to install additional OS packages.
 | 
			
		||||
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 | 
			
		||||
#     && apt-get -y install --no-install-recommends <your-package-list-here>
 | 
			
		||||
 | 
			
		||||
# [Optional] Uncomment the next line to use go get to install anything else you need
 | 
			
		||||
# RUN go get -x <your-dependency-or-tool>
 | 
			
		||||
 | 
			
		||||
# [Optional] Uncomment this section to install additional OS packages.
 | 
			
		||||
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 | 
			
		||||
#     && apt-get -y install --no-install-recommends <your-package-list-here>
 | 
			
		||||
# [Optional] Uncomment this line to install global node packages.
 | 
			
		||||
# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
 | 
			
		||||
		Reference in New Issue
	
	Block a user