From a70b904d4bf2083686e348f298b0f9f1aa5d351f Mon Sep 17 00:00:00 2001 From: uta-mori Date: Wed, 29 Jul 2020 19:57:06 +0900 Subject: [PATCH] restore 216335b --- .devcontainer/Dockerfile | 32 +++++++++++---- .devcontainer/devcontainer.json | 73 ++++++++++++--------------------- .vscode/settings.json | 2 +- 3 files changed, 51 insertions(+), 56 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 4f1b696..b7b7a97 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,5 +1,5 @@ # Update the VARIANT arg in devcontainer.json to pick an Go version -ARG VARIANT=1.14 +ARG VARIANT=1 FROM golang:${VARIANT} # This Dockerfile adds a non-root user with sudo access. Update the “remoteUser” property in @@ -27,17 +27,17 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* # Install Go tools - -ENV GO111MODULE=on - 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 \ @@ -49,13 +49,29 @@ ARG GO_TOOLS_WITH_MODULES="\ github.com/fatih/gomodifytags \ github.com/mgechev/revive \ github.com/go-delve/delve/cmd/dlv" - -RUN (echo "${GO_TOOLS_WITH_MODULES}" | xargs -n 1 go get )2>&1 \ +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 + && 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 the next line to use go get to install anything else you need # RUN go get -x + # [Optional] Uncomment this section to install additional OS packages. # RUN apt-get update \ # && export DEBIAN_FRONTEND=noninteractive \ -# && apt-get -y install --no-install-recommends +# && apt-get -y install --no-install-recommends \ No newline at end of file diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 3938c28..9b656b4 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,52 +1,31 @@ { - "name": "Go", - "build": { - "dockerfile": "Dockerfile", - // Update the VARIANT arg to pick a version of Go - "args": { "VARIANT": "1.14" } - }, - "runArgs": ["--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"], + "name": "Go", + "build": { + "dockerfile": "Dockerfile", + // Update the VARIANT arg to pick a version of Go + "args": { "VARIANT": "1" } + }, + "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ], - // Set *default* container specific settings.json values on container create. - "settings": { - "terminal.integrated.shell.linux": "/bin/bash", - "go.useLanguageServer": true, - "[go]": { - "editor.formatOnSave": true, - "editor.codeActionsOnSave": { - "source.organizeImports": true - }, - // Optional: Disable snippets, as they conflict with completion ranking. - "editor.snippetSuggestions": "none" - }, - "[go.mod]": { - "editor.formatOnSave": true, - "editor.codeActionsOnSave": { - "source.organizeImports": true - } - }, - "gopls": { - // Add parameter placeholders when completing a function. - "usePlaceholders": true, - // the completion engine is allowed to make suggestions for packages that you do not currently import. - "completeUnimported": true, + // Set *default* container specific settings.json values on container create. + "settings": { + "terminal.integrated.shell.linux": "/bin/bash", + "go.gopath": "/go", + "go.inferGopath": true, + "go.useLanguageServer": true + }, + + // Add the IDs of extensions you want installed when the container is created. + "extensions": [ + "golang.Go" + ], - // If true, enable additional analyses with staticcheck. - // Warning: This will significantly increase memory usage. - "staticcheck": true - }, - "go.lintTool": "golangci-lint" - }, + // Use 'forwardPorts' to make a list of ports inside the container available locally. + "forwardPorts": [9000], - // Add the IDs of extensions you want installed when the container is created. - "extensions": ["golang.Go"], + // Use 'postCreateCommand' to run commands after the container is created. + // "postCreateCommand": "go version", - // Use 'forwardPorts' to make a list of ports inside the container available locally. - "forwardPorts": [9000], - - // Use 'postCreateCommand' to run commands after the container is created. - // "postCreateCommand": "go version", - - // Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root. - "remoteUser": "vscode" -} + // Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root. + "remoteUser": "vscode" +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index d26b1bb..c24e64f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,4 @@ { "go.useLanguageServer": true, "go.inferGopath": false -} +} \ No newline at end of file