Skip to content

Commit

Permalink
Remove tools moved to base image
Browse files Browse the repository at this point in the history
Following components were moved to base image:

- Ansible galaxy
- vscode
- Azure Developer CLI
- Bicep

This commit removes the installation of these
components from the tools image.

Signed-off-by: Suraj Deshmukh <[email protected]>
  • Loading branch information
surajssd committed Aug 29, 2024
1 parent 11e65d2 commit 3e603c8
Showing 1 changed file with 0 additions and 29 deletions.
29 changes: 0 additions & 29 deletions linux/tools.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,34 +31,9 @@ RUN az aks install-cli \
&& chmod +x /usr/local/bin/kubectl \
&& chmod +x /usr/local/bin/kubelogin

# Install vscode
RUN wget -nv -O vscode.tar.gz "https://code.visualstudio.com/sha/download?build=insider&os=cli-alpine-x64" \
&& tar -xvzf vscode.tar.gz \
&& mv ./code-insiders /bin/vscode \
&& rm vscode.tar.gz

# Install azure-developer-cli (azd)
ENV AZD_IN_CLOUDSHELL 1
ENV AZD_SKIP_UPDATE_CHECK 1
RUN curl -fsSL https://aka.ms/install-azd.sh | bash

RUN mkdir -p /usr/cloudshell
WORKDIR /usr/cloudshell

# Install Office 365 CLI templates
RUN npm install -q -g @pnp/cli-microsoft365

# Install Bicep CLI
RUN curl -Lo bicep https://github.com/Azure/bicep/releases/latest/download/bicep-linux-x64 \
&& chmod +x ./bicep \
&& mv ./bicep /usr/local/bin/bicep \
&& bicep --help

# Temp: fix ansible modules. Proper fix is to update base layer to use regular python for Ansible.
RUN mkdir -p /usr/share/ansible/collections/ansible_collections/azure/azcollection/ \
&& wget -nv -q -O /usr/share/ansible/collections/ansible_collections/azure/azcollection/requirements.txt https://raw.githubusercontent.com/ansible-collections/azure/dev/requirements.txt \
&& /opt/ansible/bin/python -m pip install -r /usr/share/ansible/collections/ansible_collections/azure/azcollection/requirements.txt

# Powershell telemetry
ENV POWERSHELL_DISTRIBUTION_CHANNEL=CloudShell \
# don't tell users to upgrade, they can't
Expand All @@ -77,10 +52,6 @@ RUN /usr/bin/pwsh -File ./powershell/setupPowerShell.ps1 -image Base && \
# Remove su so users don't have su access by default.
RUN rm -f ./linux/Dockerfile && rm -f /bin/su

#Add soft links
RUN ln -s /usr/bin/python3 /usr/bin/python
RUN ln -s /usr/bin/node /usr/bin/nodejs

# Add user's home directories to PATH at the front so they can install tools which
# override defaults
# Add dotnet tools to PATH so users can install a tool using dotnet tools and can execute that command from any directory
Expand Down

0 comments on commit 3e603c8

Please sign in to comment.