Skip to content

Commit 5106c27

Browse files
andy-mishechkinandy-mishechkin
authored
Merge pull request #5 from actions/master
Get the last changes from master to my fork
2 parents 8bf608b + 77ee8ae commit 5106c27

8 files changed

+147
-30
lines changed

‎images/linux/scripts/installers/cleanup.sh

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/bin/bash
2+
3+
# before cleanup
4+
before=$(df / -Pm | awk 'NR==2{print $4}')
5+
6+
# clears out the local repository of retrieved package files
7+
# It removes everything but the lock file from /var/cache/apt/archives/ and /var/cache/apt/archives/partial
8+
apt-get clean
9+
10+
# after cleanup
11+
after=$(df / -Pm | awk 'NR==2{print $4}')
12+
13+
# display size
14+
echo "Before: $before MB"
15+
echo "After : $after MB"
16+
echo "Delta : $(($after-$before)) MB"

‎images/linux/ubuntu1604.json

+7
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,13 @@
289289
],
290290
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
291291
},
292+
{
293+
"type": "shell",
294+
"scripts":[
295+
"{{template_dir}}/scripts/installers/cleanup.sh"
296+
],
297+
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
298+
},
292299
{
293300
"type": "file",
294301
"source": "{{user `metadata_file`}}",

‎images/linux/ubuntu1804.json

+7
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,13 @@
293293
],
294294
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
295295
},
296+
{
297+
"type": "shell",
298+
"scripts":[
299+
"{{template_dir}}/scripts/installers/cleanup.sh"
300+
],
301+
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
302+
},
296303
{
297304
"type": "file",
298305
"source": "{{user `metadata_file`}}",

‎images/win/Windows2016-Azure.json

+12
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,12 @@
454454
"{{ template_dir }}/scripts/Installers/Install-AWS.ps1"
455455
]
456456
},
457+
{
458+
"type": "powershell",
459+
"scripts":[
460+
"{{ template_dir }}/scripts/Installers/Install-AWS-SAM.ps1"
461+
]
462+
},
457463
{
458464
"type": "powershell",
459465
"scripts":[
@@ -615,6 +621,12 @@
615621
"{{ template_dir }}/scripts/Installers/Validate-AzureCli.ps1"
616622
]
617623
},
624+
{
625+
"type": "powershell",
626+
"scripts":[
627+
"{{ template_dir }}/scripts/Installers/Validate-AWS-SAM.ps1"
628+
]
629+
},
618630
{
619631
"type": "powershell",
620632
"scripts":[

‎images/win/Windows2016-Readme.md

+59-30
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Windows Server 2016
22

3-
The following software is installed on machines with the 20200323.1 update.
3+
The following software is installed on machines with the 20200416.1 update.
44

55
Components marked with **\*** have been upgraded since the previous version of the image.
66

@@ -36,15 +36,15 @@ _Version:_ 7.0.0<br/>
3636
## Docker images
3737

3838
The following container images have been cached:
39-
* mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 (Digest: sha256:7bf99ba791cce2c51091ac0c6922ff98e5a448c1046ba046fab3760070173e0d)
40-
* mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 (Digest: sha256:000d639c6c287bf0e69b27c008f2d411a9e161093dd1855667a8e6189f9adac8)
41-
* mcr.microsoft.com/windows/servercore:ltsc2016 (Digest: sha256:5bd97dbab1afe8d3200f5d5c974df3b0130e74e8a69fddcd427699c4c8cb5037)
39+
* mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 (Digest: sha256:4610dbc0e9f033247b336ebf62b2c690dc9e93de5c937b4660aad52847123086)
40+
* mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 (Digest: sha256:888f36a9fa4ccd409967426f1a731ab6112a8acc36459268471fccd0e67e5326)
41+
* mcr.microsoft.com/windows/servercore:ltsc2016 (Digest: sha256:f4c4f31c7ee654e73bd130b89e6ad5a659f5ede52fd9eb653c9db4aa12f6e0ea)
4242
* microsoft/aspnetcore-build:1.0-2.0 (Digest: sha256:9ecc7c5a8a7a11dca5f08c860165646cb30d084606360a3a72b9cbe447241c0c)
4343
* mcr.microsoft.com/windows/nanoserver:10.0.14393.953 (Digest: sha256:fc60bd5ae0e61b334ce1cf1bcbf20c10c36b4c5482a01da319c9c989f9e6e268)
4444

4545
## Visual Studio 2017 Enterprise
4646

47-
_Version:_ VisualStudio/15.9.21+28307.1064<br/>
47+
_Version:_ VisualStudio/15.9.22+28307.1093<br/>
4848
_Location:_ C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise
4949

5050
The following workloads including required and recommended components are installed with Visual Studio 2017:
@@ -135,6 +135,8 @@ In addition the following optional components are installed:
135135
* Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre
136136
* Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre
137137
* Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre
138+
* Microsoft.VisualStudio.Workload.Office
139+
* Microsoft.VisualStudio.Workload.OfficeBuildTools
138140

139141
## SQL Server Data Tools for VS 2017
140142

@@ -173,6 +175,10 @@ _Runtime Version:_ 7.0.470.9590
173175

174176
_Version:_ 1.1.1809.18001<br/>
175177

178+
## AWS CLI
179+
180+
_Version:_ aws-cli 2.0.7<br/>
181+
176182
## Android SDK Build Tools
177183

178184
#### 29.0.3
@@ -422,13 +428,13 @@ _Description:_ .NET has been configured to use TLS 1.2 by default
422428

423429
## Azure CLI
424430

425-
_Version:_ 2.2.0
431+
_Version:_ 2.3.1
426432
_Environment:_
427433
* PATH: contains location of az.cmd
428434

429435
## Azure DevOps Cli extension
430436

431-
_Version:_ azure-devops 0.17.0
437+
_Version:_ azure-devops 0.18.0
432438

433439
## Python
434440

@@ -440,19 +446,19 @@ _Version:_ 2.7.13 (x86)<br/>_Version:_ 3.6.9 (x86)<br/>
440446

441447
## Ruby
442448

443-
_Version:_ 2.4.9 (x64)<br/>_Version:_ 2.5.7 (x64)<br/>_Version:_ 2.6.5 (x64)<br/>_Version:_ 2.7.0 (x64)<br/><br/>__System default version:__ Ruby 2.5.7p206<br/>_Environment:_<br/>* Location: C:\hostedtoolcache\windows\Ruby\2.5.7\x64\bin<br/>* PATH: contains the location of Ruby 2.5.7p206<br/>* Gem Version: 2.7.6.2<br/>
449+
_Version:_ 2.4.10 (x64)<br/>_Version:_ 2.5.8 (x64)<br/>_Version:_ 2.6.6 (x64)<br/>_Version:_ 2.7.1 (x64)<br/><br/>__System default version:__ Ruby 2.5.8p224<br/>_Environment:_<br/>* Location: C:\hostedtoolcache\windows\Ruby\2.5.8\x64\bin<br/>* PATH: contains the location of Ruby 2.5.8p224<br/>* Gem Version: 2.7.6.2<br/>
444450

445451
## OpenSSL
446452

447-
_Version:_ 1.1.1 at C:\Program Files\OpenSSL\bin\openssl.exe<br/>_Version:_ 1.1.1d at C:\Strawberry\c\bin\openssl.exe<br/>_Version:_ 1.1.1d at C:\Program Files\Git\mingw64\bin\openssl.exe<br/>_Version:_ 1.1.1d at C:\Program Files\Git\usr\bin\openssl.exe<br/>_Version:_ 1.0.2j at C:\Program Files (x86)\Subversion\bin\openssl.exe<br/>
453+
_Version:_ 1.1.1 at C:\Program Files\OpenSSL\bin\openssl.exe<br/>_Version:_ 1.1.1d at C:\Strawberry\c\bin\openssl.exe<br/>_Version:_ 1.1.1f at C:\Program Files\Git\mingw64\bin\openssl.exe<br/>_Version:_ 1.1.1f at C:\Program Files\Git\usr\bin\openssl.exe<br/>_Version:_ 1.0.2j at C:\Program Files (x86)\Subversion\bin\openssl.exe<br/>
448454

449455
## Perl
450456

451457
_Version:_ v5.30.2<br/>
452458

453459
## Git
454460

455-
_Version:_ 2.25.1<br/>
461+
_Version:_ 2.26.1<br/>
456462
_Environment:_
457463
* PATH: contains location of git.exe
458464

@@ -478,8 +484,8 @@ _Environment:_
478484
#### 1.69.0 [msvc-14.1]
479485

480486
_Environment:_
481-
* PATH: contains the location of Boost version 1.69.0
482-
* BOOST_ROOT_1_69_0: root directory of the Boost version 1.69.0 installation
487+
* BOOST_ROOT_1_69_0: root directory of the Boost version 1.69.0 installation
488+
483489
#### 1.72.0 [msvc-14.1]
484490

485491
_Environment:_
@@ -498,13 +504,21 @@ See documentation of the Boost CMake package configuration for details on what i
498504
Set `Boost_NO_BOOST_CMAKE to ON`, to disable the search for boost-cmake.
499505

500506

507+
## Composer
508+
509+
#### Composer version 1.10.5 2020-04-10 11:44:22
510+
511+
_Environment:_
512+
* PATH: contains the location of composer.exe version Composer version 1.10.5 2020-04-10 11:44:22
513+
* PHPROOT: root directory of the Composer Composer version 1.10.5 2020-04-10 11:44:22 installation
514+
501515
## PHP (x64)
502516

503-
#### 7.4.3
517+
#### 7.4.5
504518

505519
_Environment:_
506-
* PATH: contains the location of php.exe version 7.4.3
507-
* PHPROOT: root directory of the PHP 7.4.3 installation
520+
* PATH: contains the location of php.exe version 7.4.5
521+
* PHPROOT: root directory of the PHP 7.4.5 installation
508522

509523
## Rust (64-bit)
510524

@@ -515,7 +529,7 @@ _Environment:_
515529

516530
## Julia (x64)
517531

518-
_Version:_ 1.3.1<br/>
532+
_Version:_ 1.4.0<br/>
519533

520534
## sbt
521535

@@ -530,25 +544,25 @@ _Environment:_
530544
## Google Chrome
531545

532546
_version:_
533-
80.0.3987.149
547+
81.0.4044.113
534548

535549
## Microsoft Edge
536550

537551
_version:_
538-
80.0.361.69
552+
81.0.416.53
539553

540554
## Mozilla Firefox
541555

542556
_version:_
543-
74.0
557+
75.0
544558

545559
## Selenium Web Drivers
546560

547561

548562
#### Chrome Driver
549563

550564
_version:_
551-
80.0.3987.106
565+
81.0.4044.69
552566

553567
_Environment:_
554568
* ChromeWebDriver: location of chromedriver.exe
@@ -572,15 +586,15 @@ _Environment:_
572586
#### Microsoft Edge Driver
573587

574588
_version:_
575-
80.0.361.69
589+
81.0.416.53
576590

577591
_Environment:_
578592
* EdgeWebDriver: location of msedgedriver.exe
579593

580594

581595
## Node.js
582596

583-
_Version:_ 12.16.1<br/>
597+
_Version:_ 12.16.2<br/>
584598
_Architecture:_ x64<br/>
585599
_Environment:_
586600
* PATH: contains location of node.exe<br/>
@@ -591,18 +605,22 @@ _Environment:_
591605

592606
## npm
593607

594-
_Version:_ 6.13.4<br/>
608+
_Version:_ 6.14.4<br/>
595609
_Environment:_
596610
* PATH: contains location of npm.cmd
597611

598612
## bazel
599613

600-
_Version:_ bazel 2.2.0<br/>
614+
_Version:_ bazel 3.0.0<br/>
601615

602616
## bazelisk
603617

604618
_Version:_ 1.3.0<br/>
605619

620+
## Alibaba Cloud CLI
621+
622+
_Version:_ 3.0.26<br/>
623+
606624
## Java Development Kit
607625

608626
#### 1.8.0_222 (default)
@@ -636,13 +654,13 @@ _Environment:_
636654

637655
## Gradle
638656

639-
_Version:_ 6.2.2<br/>
657+
_Version:_ 6.3<br/>
640658
_Environment:_
641659
* PATH: contains location of gradle
642660

643-
## Cmake
661+
## CMake
644662

645-
_Version:_ 3.17.0<br/>
663+
_Version:_ 3.17.1<br/>
646664
_Environment:_
647665
* PATH: contains location of cmake.exe
648666

@@ -659,6 +677,8 @@ _Environment:_
659677
* PATH: contains location of dotnet.exe
660678

661679
_SDK:_
680+
* 3.1.201 C:\Program Files\dotnet\sdk\3.1.201
681+
* 3.1.103 C:\Program Files\dotnet\sdk\3.1.103
662682
* 3.1.101 C:\Program Files\dotnet\sdk\3.1.101
663683
* 3.1.100 C:\Program Files\dotnet\sdk\3.1.100
664684
* 2.2.402 C:\Program Files\dotnet\sdk\2.2.402
@@ -682,12 +702,14 @@ _SDK:_
682702
* 2.2.102 C:\Program Files\dotnet\sdk\2.2.102
683703
* 2.2.101 C:\Program Files\dotnet\sdk\2.2.101
684704
* 2.2.100 C:\Program Files\dotnet\sdk\2.2.100
705+
* 2.1.805 C:\Program Files\dotnet\sdk\2.1.805
685706
* 2.1.804 C:\Program Files\dotnet\sdk\2.1.804
686707
* 2.1.803 C:\Program Files\dotnet\sdk\2.1.803
687708
* 2.1.802 C:\Program Files\dotnet\sdk\2.1.802
688709
* 2.1.801 C:\Program Files\dotnet\sdk\2.1.801
689710
* 2.1.701 C:\Program Files\dotnet\sdk\2.1.701
690711
* 2.1.700 C:\Program Files\dotnet\sdk\2.1.700
712+
* 2.1.610 C:\Program Files\dotnet\sdk\2.1.610
691713
* 2.1.609 C:\Program Files\dotnet\sdk\2.1.609
692714
* 2.1.608 C:\Program Files\dotnet\sdk\2.1.608
693715
* 2.1.607 C:\Program Files\dotnet\sdk\2.1.607
@@ -696,6 +718,7 @@ _SDK:_
696718
* 2.1.604 C:\Program Files\dotnet\sdk\2.1.604
697719
* 2.1.603 C:\Program Files\dotnet\sdk\2.1.603
698720
* 2.1.602 C:\Program Files\dotnet\sdk\2.1.602
721+
* 2.1.513 C:\Program Files\dotnet\sdk\2.1.513
699722
* 2.1.512 C:\Program Files\dotnet\sdk\2.1.512
700723
* 2.1.511 C:\Program Files\dotnet\sdk\2.1.511
701724
* 2.1.510 C:\Program Files\dotnet\sdk\2.1.510
@@ -718,6 +741,7 @@ _SDK:_
718741
* 1.1.14 C:\Program Files\dotnet\sdk\1.1.14
719742

720743
_Runtime:_
744+
* 3.1.3 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\3.1.3
721745
* 3.1.1 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\3.1.1
722746
* 3.1.0 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\3.1.0
723747
* 2.2.8 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.2.8
@@ -737,6 +761,7 @@ _Runtime:_
737761
* 2.1.4 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.4
738762
* 2.1.3 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.3
739763
* 2.1.2 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.2
764+
* 2.1.17 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.17
740765
* 2.1.16 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.16
741766
* 2.1.15 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.15
742767
* 2.1.14 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.14
@@ -791,7 +816,7 @@ _Version:_ 19.00<br/>
791816

792817
## Packer
793818

794-
_Version:_ 1.5.4<br/>
819+
_Version:_ 1.5.5<br/>
795820

796821
## Mercurial
797822

@@ -813,9 +838,13 @@ _Version:_ 6.0.4<br/>
813838

814839
_Version:_ 5.2.4.0<br/>
815840

841+
## Nullsoft Install System (NSIS)
842+
843+
_Version:_ 3.5<br/>
844+
816845
## Cloud Foundry CLI
817846

818-
_Version:_ 6.50.0<br/>
847+
_Version:_ 6.51.0<br/>
819848

820849
## Vcpkg
821850

@@ -826,7 +855,7 @@ _Environment:_
826855

827856
## Kubectl
828857

829-
_Version:_ Client Version: v1.17.1<br/>
858+
_Version:_ Client Version: v1.18.1<br/>
830859
_Environment:_
831860
* PATH: contains location of kubectl.exe
832861

0 commit comments

Comments
 (0)