From 18f2059c82da24194763c3c75ab0a1707c7dcc38 Mon Sep 17 00:00:00 2001 From: Chuck Lantz Date: Tue, 18 Aug 2020 19:38:09 -0700 Subject: [PATCH] Add missing script for F# --- .../library-scripts/azcli-debian.sh | 31 ++++ .../library-scripts/common-debian.sh | 171 ------------------ .../library-scripts/node-debian.sh | 96 ---------- 3 files changed, 31 insertions(+), 267 deletions(-) create mode 100644 containers/dotnetcore-fsharp/.devcontainer/library-scripts/azcli-debian.sh delete mode 100755 containers/dotnetcore-fsharp/.devcontainer/library-scripts/common-debian.sh delete mode 100644 containers/dotnetcore-fsharp/.devcontainer/library-scripts/node-debian.sh diff --git a/containers/dotnetcore-fsharp/.devcontainer/library-scripts/azcli-debian.sh b/containers/dotnetcore-fsharp/.devcontainer/library-scripts/azcli-debian.sh new file mode 100644 index 00000000..cc6baeff --- /dev/null +++ b/containers/dotnetcore-fsharp/.devcontainer/library-scripts/azcli-debian.sh @@ -0,0 +1,31 @@ +#!/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: ./azcli-debian.sh + +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 + +export DEBIAN_FRONTEND=noninteractive + +# Install curl, apt-transport-https, lsb-release, or gpg if missing +if ! dpkg -s apt-transport-https curl ca-certificates lsb-release > /dev/null 2>&1 || ! type gpg > /dev/null 2>&1; then + if [ ! -d "/var/lib/apt/lists" ] || [ "$(ls /var/lib/apt/lists/ | wc -l)" = "0" ]; then + apt-get update + fi + apt-get -y install --no-install-recommends apt-transport-https curl ca-certificates lsb-release gnupg2 +fi + +# Install the Azure CLI +echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/azure-cli.list +curl -sL https://packages.microsoft.com/keys/microsoft.asc | (OUT=$(apt-key add - 2>&1) || echo $OUT) +apt-get update +apt-get install -y azure-cli +echo "Done!" \ No newline at end of file diff --git a/containers/dotnetcore-fsharp/.devcontainer/library-scripts/common-debian.sh b/containers/dotnetcore-fsharp/.devcontainer/library-scripts/common-debian.sh deleted file mode 100755 index e756809a..00000000 --- a/containers/dotnetcore-fsharp/.devcontainer/library-scripts/common-debian.sh +++ /dev/null @@ -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}" diff --git a/containers/dotnetcore-fsharp/.devcontainer/library-scripts/node-debian.sh b/containers/dotnetcore-fsharp/.devcontainer/library-scripts/node-debian.sh deleted file mode 100644 index 2837fc77..00000000 --- a/containers/dotnetcore-fsharp/.devcontainer/library-scripts/node-debian.sh +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/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: ./node-debian.sh - -export NVM_DIR=${1:-"/usr/local/share/nvm"} -export NODE_VERSION=${2:-"lts/*"} -USERNAME=${3:-"vscode"} - -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" ]; then - USERNAME=root -fi - -if [ "${NODE_VERSION}" = "none" ]; then - export NODE_VERSION= -fi - -# Ensure apt is in non-interactive to avoid prompts -export DEBIAN_FRONTEND=noninteractive - -# Install curl, apt-transport-https, tar, or gpg if missing -if ! dpkg -s apt-transport-https curl ca-certificates tar > /dev/null 2>&1 || ! type gpg > /dev/null 2>&1; then - if [ ! -d "/var/lib/apt/lists" ] || [ "$(ls /var/lib/apt/lists/ | wc -l)" = "0" ]; then - apt-get update - fi - apt-get -y install --no-install-recommends apt-transport-https curl ca-certificates tar gnupg2 -fi - -# Install yarn -if type yarn > /dev/null 2>&1; then - echo "Yarn already installed." -else - curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | (OUT=$(apt-key add - 2>&1) || echo $OUT) - echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list - apt-get update - apt-get -y install --no-install-recommends yarn -fi - -# Install the specified node version if NVM directory already exists, then exit -if [ -d "${NVM_DIR}" ]; then - echo "NVM already installed." - if [ "${NODE_VERSION}" != "" ]; then - suIf "nvm install ${NODE_VERSION}" - fi - exit 0 -fi - -mkdir -p ${NVM_DIR} - -# Set up non-root user if applicable -if [ "${USERNAME}" != "root" ] && id -u $USERNAME > /dev/null 2>&1; then - # Add NVM init and add code to update NVM ownership if UID/GID changes - tee -a /root/.bashrc /root/.zshrc /home/${USERNAME}/.bashrc >> /home/${USERNAME}/.zshrc \ -< /dev/null 2>&1; then - su ${USERNAME} -c "$@" - else - "$@" - fi -} - -# Run NVM installer as non-root if needed -suIf "$(cat \ -<< EOF - curl -so- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash - if [ "${NODE_VERSION}" != "" ]; then - source $NVM_DIR/nvm.sh - nvm alias default ${NODE_VERSION} - fi -EOF -)" 2>&1 -