Skip to content

Commit 55fe0a5

Browse files
authored
Update packages (#320)
* update packages * Update tools.Dockerfile * Update tools.Dockerfile * Update tools.Dockerfile * remove packages * update tests * update draft test case
1 parent e1a93d5 commit 55fe0a5

File tree

4 files changed

+10
-35
lines changed

4 files changed

+10
-35
lines changed

linux/base.Dockerfile

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ RUN bash ./tdnfinstall.sh \
2828
nodejs
2929

3030
ENV NPM_CONFIG_LOGLEVEL warn
31-
ENV NODE_VERSION 16.17.1
3231
ENV NODE_ENV production
3332
ENV NODE_OPTIONS=--tls-cipher-list='ECDHE-RSA-AES128-GCM-SHA256:!RC4'
3433

@@ -50,8 +49,8 @@ RUN bash ./tdnfinstall.sh \
5049
curl \
5150
bind-utils \
5251
dos2unix \
53-
dotnet-runtime-6.0 \
54-
dotnet-sdk-6.0 \
52+
dotnet-runtime-7.0 \
53+
dotnet-sdk-7.0 \
5554
e2fsprogs \
5655
emacs \
5756
gawk \
@@ -138,14 +137,14 @@ RUN bash ./tdnfinstall.sh \
138137
redis
139138

140139
# Install azure-functions-core-tools
141-
RUN wget -nv -O Azure.Functions.Cli.linux-x64.4.0.3971.zip https://github.com/Azure/azure-functions-core-tools/releases/download/4.0.3971/Azure.Functions.Cli.linux-x64.4.0.3971.zip \
142-
&& unzip -d azure-functions-cli Azure.Functions.Cli.linux-x64.4.0.3971.zip \
140+
RUN wget -nv -O Azure.Functions.Cli.zip `curl -fSsL https://api.github.com/repos/Azure/azure-functions-core-tools/releases/latest | grep "url.*linux-x64" | grep -v "sha2" | cut -d '"' -f4` \
141+
&& unzip -d azure-functions-cli Azure.Functions.Cli.zip \
143142
&& chmod +x azure-functions-cli/func \
144143
&& chmod +x azure-functions-cli/gozip \
145-
&& mv azure-functions-cli /opt \
144+
&& mv -v azure-functions-cli /opt \
146145
&& ln -sf /opt/azure-functions-cli/func /usr/bin/func \
147146
&& ln -sf /opt/azure-functions-cli/gozip /usr/bin/gozip \
148-
&& rm -r Azure.Functions.Cli.linux-x64.4.0.3971.zip
147+
&& rm -r Azure.Functions.Cli.zip
149148

150149

151150
# Setup locale to en_US.utf8
@@ -208,10 +207,10 @@ ENV GOROOT="/usr/lib/golang"
208207
ENV PATH="$PATH:$GOROOT/bin:/opt/mssql-tools18/bin"
209208

210209

211-
RUN gem install bundler --version 1.16.4 --force \
212-
&& gem install rake --version 12.3.0 --no-document --force \
213-
&& gem install colorize --version 0.8.1 --no-document --force \
214-
&& gem install rspec --version 3.7.0 --no-document --force
210+
RUN gem install bundler --force \
211+
&& gem install rake --no-document --force \
212+
&& gem install colorize --no-document --force \
213+
&& gem install rspec --no-document --force
215214

216215
ENV GEM_HOME=~/bundle
217216
ENV BUNDLE_PATH=~/bundle
@@ -222,9 +221,6 @@ ENV POWERSHELL_DISTRIBUTION_CHANNEL CloudShell
222221
# don't tell users to upgrade, they can't
223222
ENV POWERSHELL_UPDATECHECK Off
224223

225-
# Install Azure draft
226-
RUN curl -fsSL https://raw.githubusercontent.com/Azure/draft/main/scripts/install.sh | bash
227-
228224
# Install Yeoman Generator and predefined templates
229225
RUN npm install -g yo \
230226
&& npm install -g generator-az-terra-module

linux/powershell/PSCloudShellUtility/PSCloudShellUtility.psm1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1813,7 +1813,6 @@ function Get-PackageVersion() {
18131813
@{displayname = "DC/OS CLI"; command = "dcos"; args = "--version"; match = "dcoscli.version=(.*)"},
18141814
@{displayname = "Ripgrep"; command = "rg"; args = "--help | head"; match = "ripgrep ([\d\.]+)$"},
18151815
@{displayname = "Helm"; command = "helm"; args = "version --short"; match = "v(.+)"},
1816-
@{displayname = "Draft"; command = "draft"; args = "version"; match = "version: (.+)"},
18171816
@{displayname = "AZCopy"; command = "azcopy"; args = "--version"; match = "azcopy version (.+)"},
18181817
@{displayname = "Azure CLI"; command = "az"; args = "version "; match = "`"azure-cli`": `"(.+)`""},
18191818
@{displayname = "Kubectl"; command = "kubectl"; args = "version --client=true --short=true"; match = "Client Version: v(.+)"}

linux/tools.Dockerfile

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ RUN tdnf clean all
1313
RUN tdnf repolist --refresh
1414
RUN ACCEPT_EULA=Y tdnf update -y
1515

16-
RUN tdnf remove -y msodbcsql17 mssql-tools
17-
RUN ACCEPT_EULA=Y tdnf install -y msodbcsql18 mssql-tools18
18-
ENV PATH $PATH:/opt/mssql-tools18/bin
19-
2016
# Install latest Azure CLI package. CLI team drops latest (pre-release) package here prior to public release
2117
# We don't support using this location elsewhere - it may be removed or updated without notice
2218
RUN wget https://azurecliprod.blob.core.windows.net/cloudshell-release/azure-cli-latest-mariner2.0.rpm \
@@ -33,20 +29,6 @@ RUN az aks install-cli \
3329
&& chmod +x /usr/local/bin/kubectl \
3430
&& chmod +x /usr/local/bin/kubelogin
3531

36-
# Install kubectl-ai
37-
RUN curl -LO https://github.com/sozercan/kubectl-ai/releases/latest/download/kubectl-ai_linux_amd64.tar.gz && \
38-
curl -LO https://github.com/sozercan/kubectl-ai/releases/latest/download/kubectl-ai_checksums.txt && \
39-
CHECKSUM=$(grep kubectl-ai_linux_amd64.tar.gz kubectl-ai_checksums.txt | awk '{print $1}') && \
40-
echo "$CHECKSUM kubectl-ai_linux_amd64.tar.gz" | sha256sum -c - && \
41-
tar xzf kubectl-ai_linux_amd64.tar.gz && \
42-
mv kubectl-ai /usr/local/bin/kubectl-ai && \
43-
rm -rf kubectl-ai_linux_amd64.tar.gz kubectl-ai_checksums.txt
44-
45-
# Remove after base image gets updated
46-
RUN bash ./tdnfinstall.sh postgresql-devel
47-
RUN bash ./tdnfinstall.sh terraform
48-
RUN bash ./tdnfinstall.sh gh
49-
5032
RUN mkdir -p /usr/cloudshell
5133
WORKDIR /usr/cloudshell
5234

tests/command_list

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,6 @@ domainname
262262
done
263263
dos2unix
264264
dotnet
265-
draft
266265
dropdb
267266
dropuser
268267
du
@@ -636,7 +635,6 @@ ksba-config
636635
kswitch
637636
ktutil
638637
kubectl
639-
kubectl-ai
640638
kubelogin
641639
kvno
642640
last

0 commit comments

Comments
 (0)