Merge branch 'main' into releases/ubuntu20/20200723

This commit is contained in:
Maxim Lobanov
2020-07-29 18:46:40 +03:00
committed by GitHub
69 changed files with 1387 additions and 1487 deletions

View File

@@ -1,12 +1,12 @@
<!--- DO NOT EDIT - This markdown file is autogenerated. -->
# Ubuntu 16.04.6 LTS
The following software is installed on machines with the 20200709.0 update.
The following software is installed on machines with the 20200717.1 update.
***
- 7-Zip 9.20
- Ansible (ansible 2.9.10)
- AzCopy7 (available by azcopy alias) 7.3.0
- AzCopy10 (available by azcopy10 alias) 10.5.0
- Azure CLI (azure-cli 2.8.0)
- Azure CLI (azure-cli 2.9.1)
- Azure CLI (azure-devops 0.18.0)
- Basic packages:
- dnsutils
@@ -63,8 +63,8 @@ The following software is installed on machines with the 20200709.0 update.
- bzip2
- sqlite3
- libcurl3
- Alibaba Cloud CLI (3.0.50)
- AWS CLI (aws-cli/1.18.97 Python/2.7.12 Linux/4.15.0-1089-azure botocore/1.17.20)
- Alibaba Cloud CLI (3.0.53)
- AWS CLI (aws-cli/1.18.99 Python/2.7.12 Linux/4.15.0-1091-azure botocore/1.17.22)
- AWS CLI Session manager plugin (1.1.61.0)
- build-essential
- nvm (0.35.3)
@@ -78,11 +78,13 @@ Target: x86_64-unknown-linux-gnu
- Docker-Moby (Docker version 19.03.12+azure, build 0ed913b885c8919944a2e4c8d0b80a318a8dd48b)
- Docker-Buildx (0.4.1+azure)
- .NET Core SDK:
- 3.1.302
- 3.1.301
- 3.1.300
- 3.1.202
- 3.1.201
- 3.1.200
- 3.1.106
- 3.1.105
- 3.1.104
- 3.1.103
@@ -93,6 +95,7 @@ Target: x86_64-unknown-linux-gnu
- 3.0.102
- 3.0.101
- 3.0.100
- 2.1.808
- 2.1.807
- 2.1.806
- 2.1.805
@@ -102,6 +105,7 @@ Target: x86_64-unknown-linux-gnu
- 2.1.801
- 2.1.701
- 2.1.700
- 2.1.613
- 2.1.612
- 2.1.611
- 2.1.610
@@ -113,6 +117,7 @@ Target: x86_64-unknown-linux-gnu
- 2.1.604
- 2.1.603
- 2.1.602
- 2.1.516
- 2.1.515
- 2.1.514
- 2.1.513
@@ -135,7 +140,7 @@ Target: x86_64-unknown-linux-gnu
- 2.1.301
- 2.1.300
- Erlang (Erlang (SMP,ASYNC_THREADS,HIPE) (BEAM) emulator version 11.0.2)
- Firefox (Mozilla Firefox 78.0.1)
- Firefox (Mozilla Firefox 78.0.2)
- Geckodriver (0.26.0); Gecko Driver is available via GECKOWEBDRIVER environment variable
- GNU C++ 7.5.0
- GNU C++ 8.4.0
@@ -146,34 +151,34 @@ Target: x86_64-unknown-linux-gnu
- Git Large File Storage (LFS) (2.11.0)
- Git-ftp (1.0.2)
- Hub CLI (2.14.2)
- GitHub CLI 0.10.1
- Google Chrome (Google Chrome 83.0.4103.116 )
- ChromeDriver 83.0.4103.39 (ccbf011cb2d2b19b506d844400483861342c20cd-refs/branch-heads/4103@{#416}); Chrome Driver is available via CHROMEWEBDRIVER environment variable
- Google Cloud SDK (300.0.0)
- GitHub CLI 0.11.0
- Google Chrome (Google Chrome 84.0.4147.89 )
- ChromeDriver 84.0.4147.30 (48b3e868b4cc0aa7e8149519690b6f6949e110a8-refs/branch-heads/4147@{#310}); Chrome Driver is available via CHROMEWEBDRIVER environment variable
- Google Cloud SDK (301.0.0)
- Haskell Cabal (cabal-install version 3.2.0.0
compiled using version 3.2.0.0 of the Cabal library )
- GHC (The Glorious Glasgow Haskell Compilation System, version 8.6.5)
- GHC (The Glorious Glasgow Haskell Compilation System, version 8.8.3)
- GHC (The Glorious Glasgow Haskell Compilation System, version 8.10.1)
- Haskell Stack (Version 2.3.1, Git revision de2a7b694f07de7e6cf17f8c92338c16286b2878 (8103 commits) x86_64 hpack-0.33.0)
- Heroku (heroku/7.42.3 linux-x64 node-v12.16.2)
- Heroku (heroku/7.42.4 linux-x64 node-v12.16.2)
- HHVM (HipHop VM 4.56.1 (rel))
- ImageMagick
- Azul Zulu OpenJDK:
- 7 (openjdk version "1.7.0_262")
- 7 (openjdk version "1.7.0_272")
- Adopt OpenJDK:
- 8 (openjdk version "1.8.0_252") (default)
- 11 (openjdk version "11.0.7" 2020-04-14)
- 8 (openjdk version "1.8.0_262") (default)
- 11 (openjdk version "11.0.8" 2020-07-14)
- 12 (openjdk version "12.0.2" 2019-07-16)
- Ant (Apache Ant(TM) version 1.9.6 compiled on July 20 2018)
- Gradle 6.5.1
- Maven (Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f))
- Kind (kind v0.8.1 go1.14.2 linux/amd64)
- kubectl (Client Version: v1.18.5)
- kubectl (Client Version: v1.18.6)
- helm (v3.2.4+g0ad800e)
- minikube version: v1.12.0
- oc CLI Client Version: 4.5.0-202005291417-9933eb9
- Leiningen (Leiningen 2.9.4 on Java 1.8.0_252 OpenJDK 64-Bit Server VM)
- Leiningen (Leiningen 2.9.4 on Java 1.8.0_262 OpenJDK 64-Bit Server VM)
- Mercurial (Mercurial Distributed SCM (version 4.4.1))
- Miniconda (conda 4.8.3)
- Mono (Mono JIT compiler version 6.10.0.104 (tarball Fri Jun 26 19:43:02 UTC 2020))
@@ -187,12 +192,12 @@ compiled using version 3.2.0.0 of the Cabal library )
Local version: Unknown)
- n (6.6.0)
- Parcel (1.12.4)
- TypeScript (Version 3.9.6)
- TypeScript (Version 3.9.7)
- Webpack (4.43.0)
- Webpack CLI (3.3.12)
- Yarn (1.22.4)
- Newman (5.1.1)
- Bazel (bazel 3.3.1)
- Newman (5.1.2)
- Bazel (bazel 3.4.1)
- Bazelisk (1.5.0)
- ORAS CLI 0.8.1
- PhantomJS (2.1.1)
@@ -201,20 +206,20 @@ Local version: Unknown)
- PHP 7.1 (PHP 7.1.33-16+ubuntu16.04.1+deb.sury.org+1 (cli) (built: May 14 2020 08:26:44) ( NTS ))
- PHP 7.2 (PHP 7.2.32-1+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Jul 9 2020 16:33:33) ( NTS ))
- PHP 7.3 (PHP 7.3.19-1+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Jun 12 2020 07:48:10) ( NTS ))
- PHP 7.4 (PHP 7.4.7 (cli) (built: Jun 12 2020 07:43:48) ( NTS ))
- Composer (Composer version 1.10.8 2020-06-24 21:23:30)
- PHP 7.4 (PHP 7.4.8 (cli) (built: Jul 13 2020 16:45:28) ( NTS ))
- Composer (Composer version 1.10.9 2020-07-16 12:57:00)
- PHPUnit (PHPUnit 7.5.20 by Sebastian Bergmann and contributors.)
- Pollinate
- psql (PostgreSQL) 12.3
- Powershell (PowerShell 7.0.2)
- Powershell (PowerShell 7.0.3)
- ruby (2.3.1p112)
- gem (3.1.4)
- rustup (1.22.1)
- rust (1.44.1)
- cargo (1.44.1)
- rustfmt (1.4.16-stable)
- rust (1.45.0)
- cargo (1.45.0)
- rustfmt (1.4.15-stable)
- clippy (0.0.212)
- rustdoc (1.44.1)
- rustdoc (1.45.0)
- bindgen (0.54.1)
- cbindgen (0.14.3)
- cargo audit (0.12.0)
@@ -227,10 +232,10 @@ Local version: Unknown)
- Terraform (Terraform v0.12.28)
- Packer (1.6.0)
- Vcpkg 2020.06.15-unknownhash
- Vercel CLI (19.1.1)
- MongoDB on Linux (2020-07-10T00:07:14.041+0000 I CONTROL [initandlisten] db version v4.2.8
2020-07-10T00:07:14.041+0000 I CONTROL [initandlisten] git version: 43d25964249164d76d5e04dd6cf38f6111e21f5f
2020-07-10T00:07:14.041+0000 I CONTROL [initandlisten] OpenSSL version: OpenSSL 1.0.2g 1 Mar 2016)
- Vercel CLI (19.1.2)
- MongoDB on Linux (2020-07-17T10:45:19.237+0000 I CONTROL [initandlisten] db version v4.2.8
2020-07-17T10:45:19.237+0000 I CONTROL [initandlisten] git version: 43d25964249164d76d5e04dd6cf38f6111e21f5f
2020-07-17T10:45:19.237+0000 I CONTROL [initandlisten] OpenSSL version: OpenSSL 1.0.2g 1 Mar 2016)
- Haveged 1.9.1-3
- Google Repository 58
- Google Play services 49
@@ -350,5 +355,5 @@ Local version: Unknown)
- boost 1.69.0
- boost 1.72.0
- AWS SAM CLI, version 0.53.0
- Homebrew on Linux (Homebrew 2.4.5
Homebrew/linuxbrew-core (git revision 799e0; last commit 2020-07-09))
- Homebrew on Linux (Homebrew 2.4.7
Homebrew/linuxbrew-core (git revision 13cb0b; last commit 2020-07-17))

View File

@@ -1,12 +1,12 @@
<!--- DO NOT EDIT - This markdown file is autogenerated. -->
# Ubuntu 18.04.4 LTS
The following software is installed on machines with the 20200709.0 update.
The following software is installed on machines with the 20200717.1 update.
***
- 7-Zip 16.02
- Ansible (ansible 2.9.10)
- AzCopy7 (available by azcopy alias) 7.3.0
- AzCopy10 (available by azcopy10 alias) 10.5.0
- Azure CLI (azure-cli 2.8.0)
- Azure CLI (azure-cli 2.9.1)
- Azure CLI (azure-devops 0.18.0)
- Basic packages:
- dnsutils
@@ -60,8 +60,8 @@ The following software is installed on machines with the 20200709.0 update.
- bzip2
- sqlite3
- libcurl3
- Alibaba Cloud CLI (3.0.50)
- AWS CLI (aws-cli/1.18.97 Python/2.7.17 Linux/5.3.0-1028-azure botocore/1.17.20)
- Alibaba Cloud CLI (3.0.53)
- AWS CLI (aws-cli/1.18.99 Python/2.7.17 Linux/5.3.0-1032-azure botocore/1.17.22)
- AWS CLI Session manager plugin (1.1.61.0)
- build-essential
- Clang 6.0 (6.0.0)
@@ -77,11 +77,13 @@ Target: x86_64-unknown-linux-gnu
- Docker-Moby (Docker version 19.03.12+azure, build 0ed913b885c8919944a2e4c8d0b80a318a8dd48b)
- Docker-Buildx (0.4.1+azure)
- .NET Core SDK:
- 3.1.302
- 3.1.301
- 3.1.300
- 3.1.202
- 3.1.201
- 3.1.200
- 3.1.106
- 3.1.105
- 3.1.104
- 3.1.103
@@ -92,6 +94,7 @@ Target: x86_64-unknown-linux-gnu
- 3.0.102
- 3.0.101
- 3.0.100
- 2.1.808
- 2.1.807
- 2.1.806
- 2.1.805
@@ -101,6 +104,7 @@ Target: x86_64-unknown-linux-gnu
- 2.1.801
- 2.1.701
- 2.1.700
- 2.1.613
- 2.1.612
- 2.1.611
- 2.1.610
@@ -112,6 +116,7 @@ Target: x86_64-unknown-linux-gnu
- 2.1.604
- 2.1.603
- 2.1.602
- 2.1.516
- 2.1.515
- 2.1.514
- 2.1.513
@@ -134,7 +139,7 @@ Target: x86_64-unknown-linux-gnu
- 2.1.301
- 2.1.300
- Erlang (Erlang (SMP,ASYNC_THREADS,HIPE) (BEAM) emulator version 11.0.2)
- Firefox (Mozilla Firefox 78.0.1)
- Firefox (Mozilla Firefox 78.0.2)
- Geckodriver (0.26.0); Gecko Driver is available via GECKOWEBDRIVER environment variable
- GNU C++ 7.5.0
- GNU C++ 8.4.0
@@ -145,34 +150,34 @@ Target: x86_64-unknown-linux-gnu
- Git Large File Storage (LFS) (2.11.0)
- Git-ftp (1.3.1)
- Hub CLI (2.14.2)
- GitHub CLI 0.10.1
- Google Chrome (Google Chrome 83.0.4103.116 )
- ChromeDriver 83.0.4103.39 (ccbf011cb2d2b19b506d844400483861342c20cd-refs/branch-heads/4103@{#416}); Chrome Driver is available via CHROMEWEBDRIVER environment variable
- Google Cloud SDK (300.0.0)
- GitHub CLI 0.11.0
- Google Chrome (Google Chrome 84.0.4147.89 )
- ChromeDriver 84.0.4147.30 (48b3e868b4cc0aa7e8149519690b6f6949e110a8-refs/branch-heads/4147@{#310}); Chrome Driver is available via CHROMEWEBDRIVER environment variable
- Google Cloud SDK (301.0.0)
- Haskell Cabal (cabal-install version 3.2.0.0
compiled using version 3.2.0.0 of the Cabal library )
- GHC (The Glorious Glasgow Haskell Compilation System, version 8.6.5)
- GHC (The Glorious Glasgow Haskell Compilation System, version 8.8.3)
- GHC (The Glorious Glasgow Haskell Compilation System, version 8.10.1)
- Haskell Stack (Version 2.3.1, Git revision de2a7b694f07de7e6cf17f8c92338c16286b2878 (8103 commits) x86_64 hpack-0.33.0)
- Heroku (heroku/7.42.3 linux-x64 node-v12.16.2)
- HHVM (HipHop VM 4.65.0 (rel))
- Heroku (heroku/7.42.4 linux-x64 node-v12.16.2)
- HHVM (HipHop VM 4.66.1 (rel))
- ImageMagick
- Azul Zulu OpenJDK:
- 7 (openjdk version "1.7.0_262")
- 7 (openjdk version "1.7.0_272")
- Adopt OpenJDK:
- 8 (openjdk version "1.8.0_252") (default)
- 11 (openjdk version "11.0.7" 2020-04-14)
- 8 (openjdk version "1.8.0_262") (default)
- 11 (openjdk version "11.0.8" 2020-07-14)
- 12 (openjdk version "12.0.2" 2019-07-16)
- Ant (Apache Ant(TM) version 1.10.5 compiled on March 28 2019)
- Gradle 6.5.1
- Maven (Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f))
- Kind (kind v0.8.1 go1.14.2 linux/amd64)
- kubectl (Client Version: v1.18.5)
- kubectl (Client Version: v1.18.6)
- helm (v3.2.4+g0ad800e)
- minikube version: v1.12.0
- oc CLI Client Version: 4.5.0-202005291417-9933eb9
- Leiningen (Leiningen 2.9.4 on Java 1.8.0_252 OpenJDK 64-Bit Server VM)
- Leiningen (Leiningen 2.9.4 on Java 1.8.0_262 OpenJDK 64-Bit Server VM)
- Mercurial (Mercurial Distributed SCM (version 4.5.3))
- Miniconda (conda 4.8.3)
- Mono (Mono JIT compiler version 6.10.0.104 (tarball Fri Jun 26 19:38:24 UTC 2020))
@@ -187,32 +192,32 @@ compiled using version 3.2.0.0 of the Cabal library )
Local version: Unknown)
- n (6.6.0)
- Parcel (1.12.4)
- TypeScript (Version 3.9.6)
- TypeScript (Version 3.9.7)
- Webpack (4.43.0)
- Webpack CLI (3.3.12)
- Yarn (1.22.4)
- Newman (5.1.1)
- Bazel (bazel 3.3.1)
- Newman (5.1.2)
- Bazel (bazel 3.4.1)
- Bazelisk (1.5.0)
- ORAS CLI 0.8.1
- PhantomJS (2.1.1)
- PHP 7.1 (PHP 7.1.33-16+ubuntu18.04.1+deb.sury.org+1 (cli) (built: May 14 2020 08:27:11) ( NTS ))
- PHP 7.2 (PHP 7.2.32-1+ubuntu18.04.1+deb.sury.org+1 (cli) (built: Jul 9 2020 16:33:55) ( NTS ))
- PHP 7.3 (PHP 7.3.20-1+ubuntu18.04.1+deb.sury.org+1 (cli) (built: Jul 9 2020 16:34:09) ( NTS ))
- PHP 7.4 (PHP 7.4.7 (cli) (built: Jun 12 2020 07:44:05) ( NTS ))
- Composer (Composer version 1.10.8 2020-06-24 21:23:30)
- PHP 7.4 (PHP 7.4.8 (cli) (built: Jul 13 2020 16:45:47) ( NTS ))
- Composer (Composer version 1.10.9 2020-07-16 12:57:00)
- PHPUnit (PHPUnit 7.5.20 by Sebastian Bergmann and contributors.)
- Pollinate
- psql (PostgreSQL) 12.3
- Powershell (PowerShell 7.0.2)
- Powershell (PowerShell 7.0.3)
- ruby (2.5.1p57)
- gem (3.1.4)
- rustup (1.22.1)
- rust (1.44.1)
- cargo (1.44.1)
- rustfmt (1.4.16-stable)
- rust (1.45.0)
- cargo (1.45.0)
- rustfmt (1.4.15-stable)
- clippy (0.0.212)
- rustdoc (1.44.1)
- rustdoc (1.45.0)
- bindgen (0.54.1)
- cbindgen (0.14.3)
- cargo audit (0.12.0)
@@ -225,10 +230,10 @@ Local version: Unknown)
- Terraform (Terraform v0.12.28)
- Packer (1.6.0)
- Vcpkg 2020.06.15-unknownhash
- Vercel CLI (19.1.1)
- MongoDB on Linux (2020-07-09T23:51:28.041+0000 I CONTROL [initandlisten] db version v4.2.8
2020-07-09T23:51:28.041+0000 I CONTROL [initandlisten] git version: 43d25964249164d76d5e04dd6cf38f6111e21f5f
2020-07-09T23:51:28.041+0000 I CONTROL [initandlisten] OpenSSL version: OpenSSL 1.1.1g 21 Apr 2020)
- Vercel CLI (19.1.2)
- MongoDB on Linux (2020-07-17T10:52:50.926+0000 I CONTROL [initandlisten] db version v4.2.8
2020-07-17T10:52:50.926+0000 I CONTROL [initandlisten] git version: 43d25964249164d76d5e04dd6cf38f6111e21f5f
2020-07-17T10:52:50.926+0000 I CONTROL [initandlisten] OpenSSL version: OpenSSL 1.1.1g 21 Apr 2020)
- Haveged 1.9.1-6
- Google Repository 58
- Google Play services 49
@@ -342,5 +347,5 @@ Local version: Unknown)
- boost 1.69.0
- boost 1.72.0
- AWS SAM CLI, version 0.53.0
- Homebrew on Linux (Homebrew 2.4.5
Homebrew/linuxbrew-core (git revision 799e0; last commit 2020-07-09))
- Homebrew on Linux (Homebrew 2.4.7
Homebrew/linuxbrew-core (git revision 13cb0b; last commit 2020-07-17))

View File

View File

@@ -57,6 +57,7 @@ echo "y" | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager \
"platforms;android-17" \
"platforms;android-15" \
"platforms;android-10" \
"build-tools;30.0.1" \
"build-tools;30.0.0" \
"build-tools;29.0.3" \
"build-tools;29.0.2" \
@@ -132,6 +133,7 @@ DocumentInstalledItem "Android SDK Platform 17"
DocumentInstalledItem "Android SDK Platform 15"
DocumentInstalledItem "Android SDK Platform 10"
DocumentInstalledItem "Android SDK Patch Applier v4"
DocumentInstalledItem "Android SDK Build-Tools 30.0.1"
DocumentInstalledItem "Android SDK Build-Tools 30.0.0"
DocumentInstalledItem "Android SDK Build-Tools 29.0.3"
DocumentInstalledItem "Android SDK Build-Tools 29.0.2"

View File

@@ -55,6 +55,7 @@ echo "y" | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager \
"platforms;android-21" \
"platforms;android-19" \
"platforms;android-17" \
"build-tools;30.0.1" \
"build-tools;30.0.0" \
"build-tools;29.0.3" \
"build-tools;29.0.2" \
@@ -122,6 +123,7 @@ DocumentInstalledItem "Android SDK Platform 21"
DocumentInstalledItem "Android SDK Platform 19"
DocumentInstalledItem "Android SDK Platform 17"
DocumentInstalledItem "Android SDK Patch Applier v4"
DocumentInstalledItem "Android SDK Build-Tools 30.0.1"
DocumentInstalledItem "Android SDK Build-Tools 30.0.0"
DocumentInstalledItem "Android SDK Build-Tools 29.0.3"
DocumentInstalledItem "Android SDK Build-Tools 29.0.2"

View File

@@ -53,6 +53,7 @@ echo "y" | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager \
"platforms;android-29" \
"platforms;android-28" \
"platforms;android-27" \
"build-tools;30.0.1" \
"build-tools;30.0.0" \
"build-tools;29.0.3" \
"build-tools;29.0.2" \
@@ -83,6 +84,7 @@ DocumentInstalledItem "Android SDK Platform 29"
DocumentInstalledItem "Android SDK Platform 28"
DocumentInstalledItem "Android SDK Platform 27"
DocumentInstalledItem "Android SDK Patch Applier v4"
DocumentInstalledItem "Android SDK Build-Tools 30.0.1"
DocumentInstalledItem "Android SDK Build-Tools 30.0.0"
DocumentInstalledItem "Android SDK Build-Tools 29.0.3"
DocumentInstalledItem "Android SDK Build-Tools 29.0.2"

View File

@@ -15,13 +15,15 @@ wget $TarballUrl -O $TarballPath
tar -xzvf $TarballPath -C /tmp
cd /tmp/awslabs-aws-sam-cli*
# Use python 3.7 from toolcache to install aws sam, setuptools package required for the installation
Python3Dir=$(echo /opt/hostedtoolcache/Python/3.7*/x64)
mkdir /opt/python-aws-sam-cli
cp -r /opt/hostedtoolcache/Python/3.7* /opt/python-aws-sam-cli
# Use copy of python 3.7 from toolcache to install aws sam, setuptools package required for the installation
Python3Dir=$(echo /opt/python-aws-sam-cli/3.7*/x64)
Python3BinDir="${Python3Dir}/bin"
export PATH="$Python3Dir:$Python3BinDir:$PATH"
python3 -m pip install setuptools
python3 setup.py install
sudo ln -sf ${Python3BinDir}/sam /usr/local/bin/sam
$Python3BinDir/python3 -m pip install setuptools
$Python3BinDir/python3 setup.py install
ln -sf ${Python3BinDir}/sam /usr/local/bin/sam
# Run tests to determine that the software installed as expected
echo "Testing to make sure that script performed as expected, and basic scenarios work"

View File

@@ -148,3 +148,5 @@ fi
DocumentInstalledItem "Composer ($(composer --version))"
DocumentInstalledItem "PHPUnit ($(phpunit --version))"
DocumentInstalledItem "$(openssl version)"
DocumentInstalledItem "Libssl $(dpkg -l libssl-dev | grep '^ii' | awk '{print $3}')"

View File

@@ -8,6 +8,10 @@
source $HELPER_SCRIPTS/document.sh
WriteItem "<!--- DO NOT EDIT - This markdown file is autogenerated. -->"
Announcements=$(cat $HELPER_SCRIPTS/announcements.md)
WriteItem $Announcements
AddTitle "$(lsb_release -ds)"
WriteItem "The following software is installed on machines with the $IMAGE_VERSION update."
WriteItem "***"

View File

@@ -0,0 +1,10 @@
#!/bin/bash
# Source the helpers for use with the script
source $HELPER_SCRIPTS/document.sh
# install R
sudo apt-get install -y r-base
version=$(R --version | grep "R version" | cut -d " " -f 3)
DocumentInstalledItem "R $version"

View File

@@ -0,0 +1,18 @@
#!/bin/bash
# Source the helpers for use with the script
source $HELPER_SCRIPTS/document.sh
# Install Swig
sudo apt-get install -y swig
# 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 swig; then
echo "Swig was not installed"
exit 1
fi
# Document what was added to the image
echo "Lastly, documenting what we added to the metadata file"
DocumentInstalledItem "Swig $(swig -version | sed -n 2p | cut -d ' ' -f 3)"

View File

@@ -86,6 +86,11 @@
"source": "{{template_dir}}/scripts/helpers",
"destination": "{{user `helper_script_folder`}}"
},
{
"type": "file",
"source": "{{template_dir}}/announcements.md",
"destination": "{{user `helper_script_folder`}}/announcements.md"
},
{
"type": "file",
"source": "{{template_dir}}/scripts/installers",
@@ -184,6 +189,7 @@
"{{template_dir}}/scripts/installers/postgresql.sh",
"{{template_dir}}/scripts/installers/powershellcore.sh",
"{{template_dir}}/scripts/installers/ruby.sh",
"{{template_dir}}/scripts/installers/r.sh",
"{{template_dir}}/scripts/installers/rust.sh",
"{{template_dir}}/scripts/installers/julia.sh",
"{{template_dir}}/scripts/installers/sbt.sh",
@@ -196,7 +202,8 @@
"{{template_dir}}/scripts/installers/vercel.sh",
"{{template_dir}}/scripts/installers/dpkg-config.sh",
"{{template_dir}}/scripts/installers/mongodb.sh",
"{{template_dir}}/scripts/installers/rndgenerator.sh"
"{{template_dir}}/scripts/installers/rndgenerator.sh",
"{{template_dir}}/scripts/installers/swig.sh"
],
"environment_vars": [
"METADATA_FILE={{user `metadata_file`}}",
@@ -257,7 +264,7 @@
"METADATA_FILE={{user `metadata_file`}}",
"HELPER_SCRIPTS={{user `helper_script_folder`}}"
],
"execute_command": "/bin/sh -c '{{ .Vars }} {{ .Path }}'"
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
},
{
"type": "shell",

View File

@@ -89,6 +89,11 @@
"source": "{{template_dir}}/scripts/helpers",
"destination": "{{user `helper_script_folder`}}"
},
{
"type": "file",
"source": "{{template_dir}}/announcements.md",
"destination": "{{user `helper_script_folder`}}/announcements.md"
},
{
"type": "file",
"source": "{{template_dir}}/scripts/installers",
@@ -188,6 +193,7 @@
"{{template_dir}}/scripts/installers/postgresql.sh",
"{{template_dir}}/scripts/installers/powershellcore.sh",
"{{template_dir}}/scripts/installers/ruby.sh",
"{{template_dir}}/scripts/installers/r.sh",
"{{template_dir}}/scripts/installers/rust.sh",
"{{template_dir}}/scripts/installers/julia.sh",
"{{template_dir}}/scripts/installers/sbt.sh",
@@ -200,7 +206,8 @@
"{{template_dir}}/scripts/installers/vercel.sh",
"{{template_dir}}/scripts/installers/dpkg-config.sh",
"{{template_dir}}/scripts/installers/mongodb.sh",
"{{template_dir}}/scripts/installers/rndgenerator.sh"
"{{template_dir}}/scripts/installers/rndgenerator.sh",
"{{template_dir}}/scripts/installers/swig.sh"
],
"environment_vars": [
"METADATA_FILE={{user `metadata_file`}}",
@@ -261,7 +268,7 @@
"METADATA_FILE={{user `metadata_file`}}",
"HELPER_SCRIPTS={{user `helper_script_folder`}}"
],
"execute_command": "/bin/sh -c '{{ .Vars }} {{ .Path }}'"
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
},
{
"type": "shell",

View File

@@ -91,6 +91,11 @@
"source": "{{template_dir}}/scripts/helpers",
"destination": "{{user `helper_script_folder`}}"
},
{
"type": "file",
"source": "{{template_dir}}/announcements.md",
"destination": "{{user `helper_script_folder`}}/announcements.md"
},
{
"type": "file",
"source": "{{template_dir}}/scripts/installers",
@@ -190,6 +195,7 @@
"{{template_dir}}/scripts/installers/postgresql.sh",
"{{template_dir}}/scripts/installers/powershellcore.sh",
"{{template_dir}}/scripts/installers/ruby.sh",
"{{template_dir}}/scripts/installers/r.sh",
"{{template_dir}}/scripts/installers/rust.sh",
"{{template_dir}}/scripts/installers/julia.sh",
"{{template_dir}}/scripts/installers/sbt.sh",
@@ -201,7 +207,8 @@
"{{template_dir}}/scripts/installers/vcpkg.sh",
"{{template_dir}}/scripts/installers/vercel.sh",
"{{template_dir}}/scripts/installers/dpkg-config.sh",
"{{template_dir}}/scripts/installers/rndgenerator.sh"
"{{template_dir}}/scripts/installers/rndgenerator.sh",
"{{template_dir}}/scripts/installers/swig.sh"
],
"environment_vars": [
"METADATA_FILE={{user `metadata_file`}}",
@@ -262,7 +269,7 @@
"METADATA_FILE={{user `metadata_file`}}",
"HELPER_SCRIPTS={{user `helper_script_folder`}}"
],
"execute_command": "/bin/sh -c '{{ .Vars }} {{ .Path }}'"
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
},
{
"type": "shell",