File tree 5 files changed +16
-67
lines changed
5 files changed +16
-67
lines changed Original file line number Diff line number Diff line change @@ -26,24 +26,7 @@ RUN tdnf update -y && \
26
26
python3-pip \
27
27
# aspnetcore build dependencies
28
28
nodejs \
29
- npm
30
-
31
- # Powershell and azure cli aren't currently part of the azure linux 3.0 repositories.
32
- # Install powershell from the rhel8 MS repo, and azure-cli using PIP
33
-
34
- # Install powershell from the Microsoft repository.
35
- RUN curl -sSL -O https://packages.microsoft.com/config/rhel/8/packages-microsoft-prod.rpm && \
36
- rpm -i packages-microsoft-prod.rpm && \
37
- rm -f packages-microsoft-prod.rpm && \
38
- tdnf update -y && \
39
- tdnf install -y --setopt tsflags=nodocs \
40
- powershell && \
41
- rm /etc/yum.repos.d/microsoft-prod.repo && \
42
- tdnf clean all
43
-
44
- # Install azurecli from PIP
45
- RUN azureEnv="/usr/local/share/azure-cli-env" && \
46
- python3 -m venv "$azureEnv" && \
47
- "$azureEnv/bin/python" -m pip install --upgrade setuptools && \
48
- "$azureEnv/bin/python" -m pip install azure-cli && \
49
- ln -s "$azureEnv/bin/az" /usr/local/bin/az
29
+ npm \
30
+ # Provides functionality for AzureCLI AzDO task
31
+ azure-cli \
32
+ powershell
Original file line number Diff line number Diff line change @@ -24,24 +24,7 @@ RUN tdnf update -y && \
24
24
python3-pip \
25
25
# aspnetcore build dependencies
26
26
nodejs \
27
- npm
28
-
29
- # Powershell and azure cli aren't currently part of the azure linux 3.0 repositories.
30
- # Install powershell from the rhel8 MS repo, and azure-cli using PIP
31
-
32
- # Install powershell from the Microsoft repository.
33
- RUN curl -sSL -O https://packages.microsoft.com/config/rhel/8/packages-microsoft-prod.rpm && \
34
- rpm -i packages-microsoft-prod.rpm && \
35
- rm -f packages-microsoft-prod.rpm && \
36
- tdnf update -y && \
37
- tdnf install -y --setopt tsflags=nodocs \
38
- powershell && \
39
- rm /etc/yum.repos.d/microsoft-prod.repo && \
40
- tdnf clean all
41
-
42
- # Install azurecli from PIP
43
- RUN azureEnv="/usr/local/share/azure-cli-env" && \
44
- python3 -m venv "$azureEnv" && \
45
- "$azureEnv/bin/python" -m pip install --upgrade setuptools && \
46
- "$azureEnv/bin/python" -m pip install azure-cli && \
47
- ln -s "$azureEnv/bin/az" /usr/local/bin/az
27
+ npm \
28
+ # Provides functionality for AzureCLI AzDO task
29
+ azure-cli \
30
+ powershell
Original file line number Diff line number Diff line change @@ -26,24 +26,7 @@ RUN tdnf update -y && \
26
26
python3-pip \
27
27
# aspnetcore build dependencies
28
28
nodejs \
29
- npm
30
-
31
- # Powershell and azure cli aren't currently part of the azure linux 3.0 repositories.
32
- # Install powershell from the rhel8 MS repo, and azure-cli using PIP
33
-
34
- # Install powershell from the Microsoft repository.
35
- RUN curl -sSL -O https://packages.microsoft.com/config/rhel/8/packages-microsoft-prod.rpm && \
36
- rpm -i packages-microsoft-prod.rpm && \
37
- rm -f packages-microsoft-prod.rpm && \
38
- tdnf update -y && \
39
- tdnf install -y --setopt tsflags=nodocs \
40
- powershell && \
41
- rm /etc/yum.repos.d/microsoft-prod.repo && \
42
- tdnf clean all
43
-
44
- # Install azurecli from PIP
45
- RUN azureEnv="/usr/local/share/azure-cli-env" && \
46
- python3 -m venv "$azureEnv" && \
47
- "$azureEnv/bin/python" -m pip install --upgrade setuptools && \
48
- "$azureEnv/bin/python" -m pip install azure-cli && \
49
- ln -s "$azureEnv/bin/az" /usr/local/bin/az
29
+ npm \
30
+ # Provides functionality for AzureCLI AzDO task
31
+ azure-cli \
32
+ powershell
Original file line number Diff line number Diff line change @@ -22,9 +22,9 @@ RUN tdnf update -y && \
22
22
python3-pip \
23
23
# diagnostics build dependency
24
24
lldb-devel \
25
- # Provdies azure cli and powershell, used for common AzureCLI AzDO tasks
26
- powershell \
27
- azure-cli
25
+ # Provides functionality for AzureCLI AzDO task
26
+ azure-cli \
27
+ powershell
28
28
29
29
# Validate checksums with keyring after https://github.com/microsoft/azurelinux/issues/3142 is resolved
30
30
ENV NODE_VERSION=20.11.1
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ RUN tdnf install -y \
15
15
# Provides sudo
16
16
sudo \
17
17
# Provides functionality for AzureCLI AzDO task
18
- powershell \
19
18
azure-cli \
19
+ powershell \
20
20
&& tdnf clean all \
21
21
&& gem install fpm
You can’t perform that action at this time.
0 commit comments