File tree Expand file tree Collapse file tree 6 files changed +12
-6
lines changed
Expand file tree Collapse file tree 6 files changed +12
-6
lines changed Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ ARG Aws_Iam_Authenticator_Version=0.5.3
55ARG Aws_Powershell_Version=4.1.2
66ARG Azure_Cli_Version=2.14.0\*
77ARG Azure_Powershell_Version=4.5.0
8- ARG Dotnet_Sdk_Version=3.1.401-1
8+ ARG Dotnet_Sdk_Version=6.0
99ARG Ecs_Cli_Version=1.20.0
1010ARG Eks_Cli_Version=0.25.0
1111ARG Google_Cloud_Cli_Version=339.0.0-0
@@ -56,13 +56,13 @@ RUN pwsh -c 'Install-Module -Force -Name Az -AllowClobber -Scope AllUsers -Maxim
5656# Get Helm3
5757RUN wget --quiet -O - https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash -s -- -v ${Helm_Version}
5858
59- # Get .NET SDK 3.1
59+ # Get .NET SDK 6.0
6060# https://docs.microsoft.com/en-us/dotnet/core/install/linux-package-manager-ubuntu-1804
6161RUN DOTNET_CLI_TELEMETRY_OPTOUT=1 && \
6262 echo "export DOTNET_CLI_TELEMETRY_OPTOUT=1" > /etc/profile.d/set-dotnet-env-vars.sh && \
6363 apt-get install -y apt-transport-https && \
6464 apt-get update && \
65- apt-get install -y dotnet-sdk-3.1
65+ apt-get install -y dotnet-sdk-${Dotnet_Sdk_Version}
6666
6767# Get JDK
6868# https://www.digitalocean.com/community/tutorials/how-to-install-java-with-apt-on-ubuntu-18-04
Original file line number Diff line number Diff line change 11# Ubuntu WorkerTools
22
3+ > Please note that we update this document periodically to match the latest version on DockerHub which is publicly available.
4+ > This does not necessarily match the content of Dockerfiles in this repository, as they may contain changes that are not released yet.
5+
36## Image Name
47` octopusdeploy/worker-tools `
58
Original file line number Diff line number Diff line change @@ -13,7 +13,7 @@ Describe 'installed dependencies' {
1313 }
1414
1515 It ' has dotnet installed' {
16- dotnet -- version | Should -match ' 3.1 .\d+'
16+ dotnet -- version | Should -match ' 6.0 .\d+'
1717 $LASTEXITCODE | Should - be 0
1818 }
1919
Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ RUN $ProgressPreference = 'SilentlyContinue'; `
3131# Install dotnet 3.1+
3232RUN Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -outFile 'dotnet-install.ps1' ; `
3333 [Environment]::SetEnvironmentVariable('DOTNET_CLI_TELEMETRY_OPTOUT' , '1' , 'Machine' ); `
34- .\d otnet-install.ps1 -Channel '3.1 ' ; `
34+ .\d otnet-install.ps1 -Channel '6.0 ' ; `
3535 rm dotnet-install.ps1
3636
3737# Install JDK
Original file line number Diff line number Diff line change 11# Windows WorkerTools
22
3+ > Please note that we update this document periodically to match the latest version on DockerHub which is publicly available.
4+ > This does not necessarily match the content of Dockerfiles in this repository, as they may contain changes that are not released yet.
5+
36## Image Name
47` octopusdeploy/worker-tools `
58
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ Describe 'installed dependencies' {
1717 }
1818
1919 It ' has dotnet installed' {
20- dotnet -- version | Should -Match ' 3.1 .\d+'
20+ dotnet -- version | Should -Match ' 6.0 .\d+'
2121 $LASTEXITCODE | Should - be 0
2222 }
2323
You can’t perform that action at this time.
0 commit comments