Update to use latest definition
This commit is contained in:
Chuck Lantz
@@ -1,65 +1,18 @@
|
|||||||
# Update the VARIANT arg in devcontainer.json to pick an Go version
|
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.137.0/containers/go/.devcontainer/base.Dockerfile
|
||||||
ARG VARIANT=1
|
ARG VARIANT="1"
|
||||||
FROM golang:${VARIANT}
|
FROM mcr.microsoft.com/vscode/devcontainers/go:0-${VARIANT}
|
||||||
|
|
||||||
# Options for setup script
|
# [Optional] Install a version of Node.js using nvm for front end dev
|
||||||
ARG INSTALL_ZSH="true"
|
ARG INSTALL_NODE="true"
|
||||||
ARG UPGRADE_PACKAGES="false"
|
ARG NODE_VERSION="lts/*"
|
||||||
ARG USERNAME=vscode
|
RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "source /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
|
||||||
ARG USER_UID=1000
|
|
||||||
ARG USER_GID=$USER_UID
|
|
||||||
|
|
||||||
# Install needed packages and setup non-root user. Use a separate RUN statement to add your own dependencies.
|
# [Optional] Uncomment this section to install additional OS packages.
|
||||||
COPY library-scripts/*.sh /tmp/library-scripts/
|
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
|
||||||
RUN apt-get update \
|
# && apt-get -y install --no-install-recommends <your-package-list-here>
|
||||||
&& /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 the next line to use go get to install anything else you need
|
# [Optional] Uncomment the next line to use go get to install anything else you need
|
||||||
# RUN go get -x <your-dependency-or-tool>
|
# RUN go get -x <your-dependency-or-tool>
|
||||||
|
|
||||||
# [Optional] Uncomment this section to install additional OS packages.
|
# [Optional] Uncomment this line to install global node packages.
|
||||||
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
|
# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
|
||||||
# && apt-get -y install --no-install-recommends <your-package-list-here>
|
|
||||||
@@ -1,11 +1,16 @@
|
|||||||
// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
|
// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
|
||||||
// https://github.com/microsoft/vscode-dev-containers/tree/v0.134.0/containers/go
|
// https://github.com/microsoft/vscode-dev-containers/tree/v0.137.0/containers/go
|
||||||
{
|
{
|
||||||
"name": "Go",
|
"name": "Go",
|
||||||
"build": {
|
"build": {
|
||||||
"dockerfile": "Dockerfile",
|
"dockerfile": "Dockerfile",
|
||||||
// Update the VARIANT arg to pick a version of Go
|
"args": {
|
||||||
"args": { "VARIANT": "1" }
|
// Update the VARIANT arg to pick a version of Go: 1, 1.15, 1.14
|
||||||
|
"VARIANT": "1",
|
||||||
|
// Options
|
||||||
|
"INSTALL_NODE": "false",
|
||||||
|
"NODE_VERSION": "lts/*"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
|
"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
|
||||||
|
|
||||||
@@ -28,6 +33,6 @@
|
|||||||
// Use 'postCreateCommand' to run commands after the container is created.
|
// Use 'postCreateCommand' to run commands after the container is created.
|
||||||
// "postCreateCommand": "go version",
|
// "postCreateCommand": "go version",
|
||||||
|
|
||||||
// Comment out to connect as root instead.
|
// Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
|
||||||
"remoteUser": "vscode"
|
"remoteUser": "vscode"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,171 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
#-------------------------------------------------------------------------------------------------------------
|
|
||||||
# Copyright (c) Microsoft Corporation. All rights reserved.
|
|
||||||
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
|
|
||||||
#-------------------------------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
# Syntax: ./common-debian.sh [install zsh flag] [username] [user UID] [user GID] [upgrade packages flag]
|
|
||||||
|
|
||||||
INSTALL_ZSH=${1:-"true"}
|
|
||||||
USERNAME=${2:-"vscode"}
|
|
||||||
USER_UID=${3:-1000}
|
|
||||||
USER_GID=${4:-1000}
|
|
||||||
UPGRADE_PACKAGES=${5:-"true"}
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
if [ "$(id -u)" -ne 0 ]; then
|
|
||||||
echo -e 'Script must be run a root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Treat a user name of "none" as root
|
|
||||||
if [ "${USERNAME}" = "none" ] || [ "${USERNAME}" = "root" ]; then
|
|
||||||
USERNAME=root
|
|
||||||
USER_UID=0
|
|
||||||
USER_GID=0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Load markers to see which steps have already run
|
|
||||||
MARKER_FILE="/usr/local/etc/vscode-dev-containers/common"
|
|
||||||
if [ -f "${MARKER_FILE}" ]; then
|
|
||||||
echo "Marker file found:"
|
|
||||||
cat "${MARKER_FILE}"
|
|
||||||
source "${MARKER_FILE}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Ensure apt is in non-interactive to avoid prompts
|
|
||||||
export DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
# Function to call apt-get if needed
|
|
||||||
apt-get-update-if-needed()
|
|
||||||
{
|
|
||||||
if [ ! -d "/var/lib/apt/lists" ] || [ "$(ls /var/lib/apt/lists/ | wc -l)" = "0" ]; then
|
|
||||||
echo "Running apt-get update..."
|
|
||||||
apt-get update
|
|
||||||
else
|
|
||||||
echo "Skipping apt-get update."
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Run install apt-utils to avoid debconf warning then verify presence of other common developer tools and dependencies
|
|
||||||
if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
|
|
||||||
apt-get-update-if-needed
|
|
||||||
|
|
||||||
PACKAGE_LIST="apt-utils \
|
|
||||||
git \
|
|
||||||
openssh-client \
|
|
||||||
less \
|
|
||||||
iproute2 \
|
|
||||||
procps \
|
|
||||||
curl \
|
|
||||||
wget \
|
|
||||||
unzip \
|
|
||||||
nano \
|
|
||||||
jq \
|
|
||||||
lsb-release \
|
|
||||||
ca-certificates \
|
|
||||||
apt-transport-https \
|
|
||||||
dialog \
|
|
||||||
gnupg2 \
|
|
||||||
libc6 \
|
|
||||||
libgcc1 \
|
|
||||||
libgssapi-krb5-2 \
|
|
||||||
libicu[0-9][0-9] \
|
|
||||||
liblttng-ust0 \
|
|
||||||
libstdc++6 \
|
|
||||||
zlib1g \
|
|
||||||
locales \
|
|
||||||
sudo"
|
|
||||||
|
|
||||||
# Install libssl1.1 if available
|
|
||||||
if [[ ! -z $(apt-cache --names-only search ^libssl1.1$) ]]; then
|
|
||||||
PACKAGE_LIST="${PACKAGE_LIST} libssl1.1"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Install appropriate version of libssl1.0.x if available
|
|
||||||
LIBSSL=$(dpkg-query -f '${db:Status-Abbrev}\t${binary:Package}\n' -W 'libssl1\.0\.?' 2>&1 || echo '')
|
|
||||||
if [ "$(echo "$LIBSSL" | grep -o 'libssl1\.0\.[0-9]:' | uniq | sort | wc -l)" -eq 0 ]; then
|
|
||||||
if [[ ! -z $(apt-cache --names-only search ^libssl1.0.2$) ]]; then
|
|
||||||
# Debian 9
|
|
||||||
PACKAGE_LIST="${PACKAGE_LIST} libssl1.0.2"
|
|
||||||
elif [[ ! -z $(apt-cache --names-only search ^libssl1.0.0$) ]]; then
|
|
||||||
# Ubuntu 18.04, 16.04, earlier
|
|
||||||
PACKAGE_LIST="${PACKAGE_LIST} libssl1.0.0"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Packages to verify are installed: ${PACKAGE_LIST}"
|
|
||||||
apt-get -y install --no-install-recommends ${PACKAGE_LIST} 2> >( grep -v 'debconf: delaying package configuration, since apt-utils is not installed' >&2 )
|
|
||||||
|
|
||||||
PACKAGES_ALREADY_INSTALLED="true"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Get to latest versions of all packages
|
|
||||||
if [ "${UPGRADE_PACKAGES}" = "true" ]; then
|
|
||||||
apt-get-update-if-needed
|
|
||||||
apt-get -y upgrade --no-install-recommends
|
|
||||||
apt-get autoremove -y
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Ensure at least the en_US.UTF-8 UTF-8 locale is available.
|
|
||||||
# Common need for both applications and things like the agnoster ZSH theme.
|
|
||||||
if [ "${LOCALE_ALREADY_SET}" != "true" ]; then
|
|
||||||
echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
|
|
||||||
locale-gen
|
|
||||||
LOCALE_ALREADY_SET="true"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Create or update a non-root user to match UID/GID - see https://aka.ms/vscode-remote/containers/non-root-user.
|
|
||||||
if id -u $USERNAME > /dev/null 2>&1; then
|
|
||||||
# User exists, update if needed
|
|
||||||
if [ "$USER_GID" != "$(id -G $USERNAME)" ]; then
|
|
||||||
groupmod --gid $USER_GID $USERNAME
|
|
||||||
usermod --gid $USER_GID $USERNAME
|
|
||||||
fi
|
|
||||||
if [ "$USER_UID" != "$(id -u $USERNAME)" ]; then
|
|
||||||
usermod --uid $USER_UID $USERNAME
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
# Create user
|
|
||||||
groupadd --gid $USER_GID $USERNAME
|
|
||||||
useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Add add sudo support for non-root user
|
|
||||||
if [ "${EXISTING_NON_ROOT_USER}" != "${USERNAME}" ]; then
|
|
||||||
echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME
|
|
||||||
chmod 0440 /etc/sudoers.d/$USERNAME
|
|
||||||
EXISTING_NON_ROOT_USER="${USERNAME}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Ensure ~/.local/bin is in the PATH for root and non-root users for bash. (zsh is later)
|
|
||||||
if [ "${DOT_LOCAL_ALREADY_ADDED}" != "true" ]; then
|
|
||||||
echo "export PATH=\$PATH:\$HOME/.local/bin" | tee -a /root/.bashrc >> /home/$USERNAME/.bashrc
|
|
||||||
chown $USER_UID:$USER_GID /home/$USERNAME/.bashrc
|
|
||||||
DOT_LOCAL_ALREADY_ADDED="true"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Optionally install and configure zsh
|
|
||||||
if [ "${INSTALL_ZSH}" = "true" ] && [ ! -d "/root/.oh-my-zsh" ] && [ "${ZSH_ALREADY_INSTALLED}" != "true" ]; then
|
|
||||||
apt-get-update-if-needed
|
|
||||||
apt-get install -y zsh
|
|
||||||
curl -fsSLo- https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh | bash 2>&1
|
|
||||||
echo "export PATH=\$PATH:\$HOME/.local/bin" >> /root/.zshrc
|
|
||||||
if [ "${USERNAME}" != "root" ]; then
|
|
||||||
cp -fR /root/.oh-my-zsh /home/$USERNAME
|
|
||||||
cp -f /root/.zshrc /home/$USERNAME
|
|
||||||
sed -i -e "s/\/root\/.oh-my-zsh/\/home\/$USERNAME\/.oh-my-zsh/g" /home/$USERNAME/.zshrc
|
|
||||||
chown -R $USER_UID:$USER_GID /home/$USERNAME/.oh-my-zsh /home/$USERNAME/.zshrc
|
|
||||||
fi
|
|
||||||
ZSH_ALREADY_INSTALLED="true"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Write marker file
|
|
||||||
mkdir -p "$(dirname "${MARKER_FILE}")"
|
|
||||||
echo -e "\
|
|
||||||
PACKAGES_ALREADY_INSTALLED=${PACKAGES_ALREADY_INSTALLED}\n\
|
|
||||||
LOCALE_ALREADY_SET=${LOCALE_ALREADY_SET}\n\
|
|
||||||
EXISTING_NON_ROOT_USER=${EXISTING_NON_ROOT_USER}\n\
|
|
||||||
DOT_LOCAL_ALREADY_ADDED=${DOT_LOCAL_ALREADY_ADDED}\n\
|
|
||||||
ZSH_ALREADY_INSTALLED=${ZSH_ALREADY_INSTALLED}" > "${MARKER_FILE}"
|
|
||||||
Reference in New Issue
Block a user