Skip to content

Update non AzLinux Packages in Tools Image #628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ComradeCow merged 4 commits into from
Jun 16, 2026
Merged

Update non AzLinux Packages in Tools Image #628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
44f28da
Unzip in tmp dir so we don't leave files in the root folder
ComradeCow Jun 11, 2026
20b5e75
Adds update steps for teraform, azd, and bicep
ComradeCow Jun 11, 2026
ceaea27
Adds output for help logging
ComradeCow Jun 11, 2026
7cbb04d
Consolidate updates to a single layer
ComradeCow Jun 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions linux/base.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,17 @@ ENV NODE_OPTIONS=--tls-cipher-list='ECDHE-RSA-AES128-GCM-SHA256:!RC4'
# Get latest version of Terraform.
# Customers require the latest version of Terraform.
RUN TF_VERSION=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/terraform | jq -r -M ".current_version") \
&& TF_INSTALL_DIR=$(mktemp -d) \
&& pushd $TF_INSTALL_DIR \
&& TF_VERSION="${TF_VERSION#v}" \
&& wget -nv -O terraform.zip "https://releases.hashicorp.com/terraform/${TF_VERSION}/terraform_${TF_VERSION}_linux_amd64.zip" \
&& wget -nv -O terraform.sha256 "https://releases.hashicorp.com/terraform/${TF_VERSION}/terraform_${TF_VERSION}_SHA256SUMS" \
&& echo "$(grep "${TF_VERSION}_linux_amd64.zip" terraform.sha256 | awk '{print $1}') terraform.zip" | sha256sum -c \
&& unzip terraform.zip \
&& mv terraform /usr/local/bin/terraform \
&& rm -f terraform.zip terraform.sha256 \
&& unset TF_VERSION
&& popd \
&& rm -rf $TF_INSTALL_DIR \
&& unset TF_VERSION TF_INSTALL_DIR

# Setup locale to en_US.utf8
RUN echo 'LANG=en_US.UTF-8' >> /etc/locale.conf && locale-gen.sh
Expand Down Expand Up @@ -200,7 +203,8 @@ RUN curl -fsSL https://aka.ms/install-azd.sh | bash && \
#
# Install Office 365 CLI templates
#
npm install -q -g @pnp/cli-microsoft365 && \
npm install -q -g @pnp/cli-microsoft365 \
&& m365 version && \

@codekrafter codekrafter Jun 12, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do we use this version check for?

@ComradeCow ComradeCow Jun 15, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to output data to stdout, similar to some of the other installs. When I was testing the update logic, I had to hop into the image to find the version. Having it show in the output made that particular step faster.

#
# Install Bicep CLI
#
Expand Down
59 changes: 57 additions & 2 deletions linux/tools.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# To build yourself locally, override this location with a local image tag. See README.md for more detail

ARG IMAGE_LOCATION=cloudconregprd.azurecr.io/public/azure-cloudshell:base.master.4bb8adf7.20260602.1
ARG IMAGE_LOCATION=mcr.microsoft.com/azure-cloudshell:base.master.894ed5cf.20260518.1

# Copy from base build
FROM ${IMAGE_LOCATION}
Expand All @@ -24,7 +24,10 @@ RUN tdnf clean all && \

# Install any Azure CLI extensions that should be included by default.
RUN az extension add --system --name ssh -y \
&& az extension add --system --name ml -y
&& az extension add --system --name ml -y \
# Configure Bicep settings
&& az config set bicep.check_version=False \
&& az config set bicep.use_binary_from_path=True

# Install kubectl
RUN az aks install-cli \
Expand All @@ -39,6 +42,58 @@ RUN wget -nv -O Azure.Functions.Cli.zip `curl -fSsL https://api.github.com/repos
&& ln -sf /opt/azure-functions-cli/func /usr/bin/func \
&& rm -r Azure.Functions.Cli.zip

# Conditionally update tools that were pre-installed in the base image.
# Each check only installs when a newer version is available, keeping the
# tools image layer as small as possible.
RUN set -e \
# --- Terraform ---
&& TF_LATEST=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/terraform | jq -r -M ".current_version") \
&& TF_LATEST="${TF_LATEST#v}" \
&& TF_CURRENT=$(/usr/local/bin/terraform version -json 2>/dev/null | jq -r '.terraform_version' 2>/dev/null || echo "0") \
&& TF_CURRENT="${TF_CURRENT#v}" \
&& if [ "$TF_LATEST" != "$TF_CURRENT" ]; then \
rm -f /usr/local/bin/terraform \
&& TF_INSTALL_DIR=$(mktemp -d) \
&& pushd $TF_INSTALL_DIR \
&& wget -nv -O terraform.zip "https://releases.hashicorp.com/terraform/${TF_LATEST}/terraform_${TF_LATEST}_linux_amd64.zip" \
&& wget -nv -O terraform.sha256 "https://releases.hashicorp.com/terraform/${TF_LATEST}/terraform_${TF_LATEST}_SHA256SUMS" \
&& echo "$(grep "${TF_LATEST}_linux_amd64.zip" terraform.sha256 | awk '{print $1}') terraform.zip" | sha256sum -c \
&& unzip terraform.zip \
&& mv terraform /usr/local/bin/terraform \
&& echo "Updated Terraform $TF_CURRENT -> $TF_LATEST" \
&& popd \
&& rm -rf $TF_INSTALL_DIR ; \
else \
echo "Terraform already up to date: $TF_LATEST" ; \
fi \
&& unset TF_LATEST TF_CURRENT TF_INSTALL_DIR \
# --- azd ---
&& azd update --no-prompt \
# --- Ruby gems ---
&& OUTDATED=$(gem outdated 2>/dev/null | awk '{print $1}') \
&& for gem_name in bundler rake colorize rspec; do \
if echo "$OUTDATED" | grep -qx "$gem_name"; then \
echo "Updating gem: $gem_name" ; \
gem update "$gem_name" --no-document --force ; \
else \
echo "Gem already up to date: $gem_name" ; \
fi ; \
done \
&& rm -rf $(gem env gemdir)/cache/*.gem \
&& unset OUTDATED \
# --- @pnp/cli-microsoft365 ---
&& PKG=@pnp/cli-microsoft365 \
&& CURRENT=$(npm list -g --depth=0 --json 2>/dev/null | jq -r --arg p "$PKG" '.dependencies[$p].version // "0"') \
&& LATEST=$(npm view "$PKG" version 2>/dev/null) \
&& if [ -n "$LATEST" ] && [ "$CURRENT" != "$LATEST" ]; then \
echo "Updating $PKG: $CURRENT -> $LATEST" ; \
npm install -q -g "$PKG@$LATEST" ; \
npm cache clean --force ; \
else \
echo "$PKG already up to date: $CURRENT" ; \
fi \
&& unset PKG CURRENT LATEST

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

Expand Down