Skip to content

Commit 90e36c5

Browse files
authored
Made sudo optional for linux jdk provisioning (#28195)
When used in some scenarios (eg: Dockerfile), sudo isn't desirable, so this provides a way to optionally remove it from the invocation.
1 parent 872beeb commit 90e36c5

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/Provisioning/Provisioning.csproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,13 +241,15 @@
241241
<PropertyGroup>
242242
<_JdkHostArchitecture Condition=" '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'X64' ">amd64</_JdkHostArchitecture>
243243
<_JdkHostArchitecture Condition=" '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' != 'X64' ">arm64</_JdkHostArchitecture>
244+
<ProvisionRequiresSudo Condition=" '$(ProvisionRequiresSudo)' == '' ">True</ProvisionRequiresSudo>
245+
<_JdkSudo Condition=" '$(ProvisionRequiresSudo)' == 'True' ">sudo </_JdkSudo>
244246
</PropertyGroup>
245247
<ItemGroup>
246248
<_ProvisionJdkLinuxCommands Include="wget https://packages.microsoft.com/config/ubuntu/`lsb_release -rs`/packages-microsoft-prod.deb -O packages-microsoft-prod.deb" />
247-
<_ProvisionJdkLinuxCommands Include="sudo dpkg -i packages-microsoft-prod.deb" />
249+
<_ProvisionJdkLinuxCommands Include="$(_JdkSudo)dpkg -i packages-microsoft-prod.deb" />
248250
<_ProvisionJdkLinuxCommands Include="rm packages-microsoft-prod.deb" />
249-
<_ProvisionJdkLinuxCommands Include="sudo apt-get update" />
250-
<_ProvisionJdkLinuxCommands Include="sudo apt-get install -y msopenjdk-$(_AndroidJdkMajorVersion)" />
251+
<_ProvisionJdkLinuxCommands Include="$(_JdkSudo)apt-get update" />
252+
<_ProvisionJdkLinuxCommands Include="$(_JdkSudo)apt-get install -y msopenjdk-$(_AndroidJdkMajorVersion)" />
251253
</ItemGroup>
252254
<Exec Command="%(_ProvisionJdkLinuxCommands.Identity)" />
253255
<PropertyGroup>

0 commit comments

Comments
 (0)