Merge branch 'master' into v-andmis/ubuntu/131_remove_duplicate_repos_dotnetcore

images/linux/scripts/installers/1604/basic.sh

@@ -31,11 +31,12 @@ apt-fast install -y --no-install-recommends \
     sudo \
     telnet \
     time \
+    tzdata \
     unzip \
     upx \
     wget \
     zip \
-    tzdata
+    zstd
 
 # Electron / VSCode / GitHub Desktop prereqs
 apt-fast install -y --no-install-recommends \
@@ -86,8 +87,9 @@ DocumentInstalledItemIndent "shellcheck"
 DocumentInstalledItemIndent "sudo"
 DocumentInstalledItemIndent "telnet"
 DocumentInstalledItemIndent "time"
+DocumentInstalledItemIndent "tzdata"
 DocumentInstalledItemIndent "unzip"
 DocumentInstalledItemIndent "upx"
 DocumentInstalledItemIndent "wget"
 DocumentInstalledItemIndent "zip"
-DocumentInstalledItemIndent "tzdata"
+DocumentInstalledItemIndent "zstd"

images/linux/scripts/installers/1804/basic.sh

@@ -58,6 +58,9 @@ apt-get install -y --no-install-recommends telnet
 echo "Install time"
 apt-get install -y --no-install-recommends time
 
+echo "Install tzdata"
+apt-get install -y --no-install-recommends tzdata
+
 echo "Install unzip"
 apt-get install -y --no-install-recommends unzip
 
@@ -70,8 +73,8 @@ apt-get install -y --no-install-recommends wget
 echo "Install zip"
 apt-get install -y --no-install-recommends zip
 
-echo "Install tzdata"
-apt-get install -y --no-install-recommends tzdata
+echo "Install zstd"
+apt-get install -y --no-install-recommends zstd
 
 echo "Install libxkbfile"
 apt-get install -y --no-install-recommends libxkbfile-dev
@@ -155,8 +158,9 @@ DocumentInstalledItemIndent "shellcheck"
 DocumentInstalledItemIndent "sudo"
 DocumentInstalledItemIndent "telnet"
 DocumentInstalledItemIndent "time"
+DocumentInstalledItemIndent "tzdata"
 DocumentInstalledItemIndent "unzip"
 DocumentInstalledItemIndent "upx"
 DocumentInstalledItemIndent "wget"
 DocumentInstalledItemIndent "zip"
-DocumentInstalledItemIndent "tzdata"
+DocumentInstalledItemIndent "zstd"

images/linux/scripts/installers/1804/powershellcore.sh

@@ -8,14 +8,16 @@
 source $HELPER_SCRIPTS/document.sh
 
 LSB_RELEASE=$(lsb_release -rs)
+
 sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-bionic-prod bionic main" > /etc/apt/sources.list.d/dotnetdev.list'
+# libicu64, which comes with php-intl module, has powershell breaking issue https://github.com/PowerShell/PowerShell/issues/9746
+# Fix - install additional libicu65 where the issue is fixed
+echo "install libicu65"
+apt get install libicu65
 
 # Install Powershell
 apt-get install -y powershell
 
-# Temp fix based on: https://github.com/PowerShell/PowerShell/issues/9746
-sudo apt remove libicu64
-
 # Run tests to determine that the software installed as expected
 echo "Testing to make sure that script performed as expected, and basic scenarios work"
 if ! command -v pwsh; then

images/linux/scripts/installers/azure-cli.sh

@@ -7,13 +7,8 @@
 # Source the helpers for use with the script
 source $HELPER_SCRIPTS/document.sh
 
-LSB_CODENAME=$(lsb_release -cs)
-
 # Install Azure CLI (instructions taken from https://docs.microsoft.com/en-us/cli/azure/install-azure-cli)
-echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $LSB_CODENAME main" | tee /etc/apt/sources.list.d/azure-cli.list
-apt-key adv --keyserver packages.microsoft.com --recv-keys B02C46DF417A0893
-apt-get update
-apt-get install -y --no-install-recommends apt-transport-https azure-cli
+curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
 
 # Run tests to determine that the software installed as expected
 echo "Testing to make sure that script performed as expected, and basic scenarios work"

images/linux/scripts/installers/azure-devops-cli.sh

@@ -7,6 +7,11 @@
 # Source the helpers for use with the script
 source $HELPER_SCRIPTS/document.sh
 
+# AZURE_EXTENSION_DIR shell variable defines where modules are installed
+# https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview
+export AZURE_EXTENSION_DIR=/opt/az/azcliextensions
+echo "AZURE_EXTENSION_DIR=$AZURE_EXTENSION_DIR" | tee -a /etc/environment
+
 # install azure devops Cli extension
 az extension add -n azure-devops
 

images/linux/scripts/installers/dotnetcore-sdk.sh

@@ -36,7 +36,12 @@ for latest_package in ${LATEST_DOTNET_PACKAGES[@]}; do
     echo "Determing if .NET Core ($latest_package) is installed"
     if ! IsInstalled $latest_package; then
         echo "Could not find .NET Core ($latest_package), installing..."
-        apt-get install $latest_package -y
+        #temporary avoid 3.1.102 installation due to https://github.com/dotnet/aspnetcore/issues/19133
+        if [ $latest_package != "dotnet-sdk-3.1" ]; then
+            apt-get install $latest_package -y
+        else
+            apt-get install dotnet-sdk-3.1=3.1.101-1 -y
+        fi
     else
         echo ".NET Core ($latest_package) is already installed"
     fi
@@ -52,7 +57,8 @@ for release_url in ${release_urls[@]}; do
     sdks=("${sdks[@]}" $(echo "${releases}" | jq '.releases[]' | jq '.sdks[]?' | jq '.version'))
 done
 
-sortedSdks=$(echo ${sdks[@]} | tr ' ' '\n' | grep -v preview | grep -v rc | grep -v display | cut -d\" -f2 | sort -u -r)
+#temporary avoid 3.1.102 installation due to https://github.com/dotnet/aspnetcore/issues/19133
+sortedSdks=$(echo ${sdks[@]} | tr ' ' '\n' | grep -v 3.1.102 | grep -v preview | grep -v rc | grep -v display | cut -d\" -f2 | sort -u -r)
 
 for sdk in $sortedSdks; do
     url="https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$sdk/dotnet-sdk-$sdk-linux-x64.tar.gz"

images/linux/scripts/installers/julia.sh

@@ -0,0 +1,62 @@
+#!/bin/bash
+################################################################################
+##  File:  julia.sh
+##  Desc:  Installs Julia, and adds Julia to the path
+################################################################################
+
+# Source the helpers for use with the script
+source $HELPER_SCRIPTS/document.sh
+
+# This function fetches the latest Julia release from the GitHub API
+# Based on https://gist.github.com/lukechilds/a83e1d7127b78fef38c2914c4ececc3c
+function GetLatestJuliaRelease () {
+    curl --silent "https://api.github.com/repos/julialang/julia/releases/latest" |
+    grep '"tag_name":' |
+    sed -E 's/.*"([^"]+)".*/\1/' |
+    sed 's/v//' # remove v prefix
+}
+
+
+# This function installs Julia using the specified arguments:
+#   $1=MajorAndMinorVersion (1.3.1)
+#   $2=IsDefaultVersion (true or false)
+
+function InstallJulia () {
+    # Extract Major and Minor version from full version string
+    juliaMajorAndMinorVersion="$(sed 's/\.[^.]*$//' <<< $1)"
+
+    curl -sL "https://julialang-s3.julialang.org/bin/linux/x64/$juliaMajorAndMinorVersion/julia-$1-linux-x86_64.tar.gz" -o "julia-$1-linux-x86_64.tar.gz"
+    mkdir -p "/usr/local/julia$juliaMajorAndMinorVersion"
+    tar -C "/usr/local/julia$juliaMajorAndMinorVersion" -xzf "julia-$1-linux-x86_64.tar.gz" --strip-components=1 julia
+    rm "julia-$1-linux-x86_64.tar.gz"
+
+    # If this version of Julia is to be the default version,
+    # symlink it into the path
+    if [ "$2" = true ]; then
+        ln -s "/usr/local/julia$juliaMajorAndMinorVersion/bin/julia" /usr/bin/julia
+    fi
+
+    # Run tests to determine that the software installed as expected
+    echo "Testing to make sure that script performed as expected, and basic scenarios work"
+
+    # If this version of Julia is to be the default version,
+    # check that it has been added to PATH
+    if [ "$2" = true ]; then
+        if ! command -v julia; then
+            echo "Julia was not installed or found on PATH"
+            exit 1
+        fi
+    fi
+
+    # Verify output of julia --version
+    if [ ! "$(/usr/local/julia"$juliaMajorAndMinorVersion"/bin/julia --version)" = "julia version $1" ]; then
+        echo "Julia was not installed correctly"
+        exit 1
+    fi
+
+    # Document what was added to the image
+    echo "Lastly, documenting what we added to the metadata file"
+    DocumentInstalledItem "Julia ($(julia --version))"
+}
+
+InstallJulia "$(GetLatestJuliaRelease)" true