Update dotnet version in dotnetcore images (#2465)

* Update dotnet version in dotnetcore images * update yarn version
microsoft · Jun 18, 2024 · cf00640 · cf00640
1 parent 54eb85a
commit cf00640
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 11 deletions.
diff --git a/images/runtime/commonbase/nodeRuntimeBase.Dockerfile b/images/runtime/commonbase/nodeRuntimeBase.Dockerfile
@@ -15,10 +15,13 @@ RUN apt-get update \
 RUN ${IMAGES_DIR}/receiveGpgKeys.sh \
     6A010C5166006599AA17F08146C2130DFD2497F5
 
-COPY images/yarn-v1.22.15.tar.gz .
+ARG YARN_VERSION=1.22.15
+ENV YARN_VERSION ${YARN_VERSION}
+
+COPY images/yarn-v${YARN_VERSION}.tar.gz .
 
 RUN mkdir -p /opt \
-  && tar -xzf yarn-v1.22.15.tar.gz -C /opt/ \
-  && ln -s /opt/yarn-v1.22.15/bin/yarn /usr/local/bin/yarn \
-  && ln -s /opt/yarn-v1.22.15/bin/yarnpkg /usr/local/bin/yarnpkg \
-  && rm yarn-v1.22.15.tar.gz
+  && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
+  && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+  && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
+  && rm yarn-v$YARN_VERSION.tar.gz
diff --git a/images/runtime/dotnetcore/6.0/bullseye.Dockerfile b/images/runtime/dotnetcore/6.0/bullseye.Dockerfile
@@ -80,7 +80,7 @@ ARG AI_CONNECTION_STRING
 ARG USER_DOTNET_AI_VERSION
 ENV USER_DOTNET_AI_VERSION=${USER_DOTNET_AI_VERSION}
 ENV ORYX_AI_CONNECTION_STRING=${AI_CONNECTION_STRING} 
-ENV DOTNET_VERSION=%DOTNET_VERSION%
+ENV DOTNET_VERSION="6.0"
 ENV ASPNETCORE_LOGGING__CONSOLE__DISABLECOLORS=true
 #Bake in client certificate path into image to avoid downloading it
 ENV PATH_CA_CERTIFICATE="/etc/ssl/certs/ca-certificate.crt"

diff --git a/images/runtime/dotnetcore/6.0/buster.Dockerfile b/images/runtime/dotnetcore/6.0/buster.Dockerfile
@@ -83,7 +83,7 @@ ARG AI_CONNECTION_STRING
 ARG USER_DOTNET_AI_VERSION
 ENV USER_DOTNET_AI_VERSION=${USER_DOTNET_AI_VERSION}
 ENV ORYX_AI_CONNECTION_STRING=${AI_CONNECTION_STRING} 
-ENV DOTNET_VERSION=%DOTNET_VERSION%
+ENV DOTNET_VERSION="6.0"
 ENV ASPNETCORE_LOGGING__CONSOLE__DISABLECOLORS=true
 #Bake in client certificate path into image to avoid downloading it
 ENV PATH_CA_CERTIFICATE="/etc/ssl/certs/ca-certificate.crt"

diff --git a/images/runtime/dotnetcore/7.0/bullseye.Dockerfile b/images/runtime/dotnetcore/7.0/bullseye.Dockerfile
@@ -79,7 +79,7 @@ ARG AI_CONNECTION_STRING
 ARG USER_DOTNET_AI_VERSION
 ENV USER_DOTNET_AI_VERSION=${USER_DOTNET_AI_VERSION}
 ENV ORYX_AI_CONNECTION_STRING=${AI_CONNECTION_STRING} 
-ENV DOTNET_VERSION=%DOTNET_VERSION%
+ENV DOTNET_VERSION="7.0"
 ENV ASPNETCORE_LOGGING__CONSOLE__DISABLECOLORS=true
 #Bake in client certificate path into image to avoid downloading it
 ENV PATH_CA_CERTIFICATE="/etc/ssl/certs/ca-certificate.crt"

diff --git a/images/runtime/dotnetcore/7.0/buster.Dockerfile b/images/runtime/dotnetcore/7.0/buster.Dockerfile
@@ -82,7 +82,7 @@ ARG AI_CONNECTION_STRING
 ARG USER_DOTNET_AI_VERSION
 ENV USER_DOTNET_AI_VERSION=${USER_DOTNET_AI_VERSION}
 ENV ORYX_AI_CONNECTION_STRING=${AI_CONNECTION_STRING} 
-ENV DOTNET_VERSION=%DOTNET_VERSION%
+ENV DOTNET_VERSION="7.0"
 ENV ASPNETCORE_LOGGING__CONSOLE__DISABLECOLORS=true
 #Bake in client certificate path into image to avoid downloading it
 ENV PATH_CA_CERTIFICATE="/etc/ssl/certs/ca-certificate.crt"

diff --git a/images/runtime/dotnetcore/8.0/bookworm.Dockerfile b/images/runtime/dotnetcore/8.0/bookworm.Dockerfile
@@ -83,7 +83,7 @@ ARG AI_CONNECTION_STRING
 ARG USER_DOTNET_AI_VERSION
 ENV USER_DOTNET_AI_VERSION=${USER_DOTNET_AI_VERSION}
 ENV ORYX_AI_CONNECTION_STRING=${AI_CONNECTION_STRING} 
-ENV DOTNET_VERSION=%DOTNET_VERSION%
+ENV DOTNET_VERSION="8.0"
 ENV ASPNETCORE_LOGGING__CONSOLE__DISABLECOLORS=true
 #Bake in client certificate path into image to avoid downloading it
 ENV PATH_CA_CERTIFICATE="/etc/ssl/certs/ca-certificate.crt"

diff --git a/images/runtime/dotnetcore/8.0/bullseye.Dockerfile b/images/runtime/dotnetcore/8.0/bullseye.Dockerfile
@@ -82,7 +82,7 @@ ARG AI_CONNECTION_STRING
 ARG USER_DOTNET_AI_VERSION
 ENV USER_DOTNET_AI_VERSION=${USER_DOTNET_AI_VERSION}
 ENV ORYX_AI_CONNECTION_STRING=${AI_CONNECTION_STRING} 
-ENV DOTNET_VERSION=%DOTNET_VERSION%
+ENV DOTNET_VERSION="8.0"
 ENV ASPNETCORE_LOGGING__CONSOLE__DISABLECOLORS=true
 #Bake in client certificate path into image to avoid downloading it
 ENV PATH_CA_CERTIFICATE="/etc/ssl/certs/ca-certificate.crt"