feat(jammy): dotnet and powershell support (#409)

containerbase · Jun 13, 2022 · 205d85b · 205d85b
1 parent 80f579d
commit 205d85b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/usr/local/buildpack/tools/dotnet.sh b/src/usr/local/buildpack/tools/dotnet.sh
@@ -22,6 +22,7 @@ version_codename=$(get_distro)
 case "$version_codename" in
   "bionic") apt_install libc6 libgcc1 libgssapi-krb5-2 libicu60 libssl1.1 libstdc++6 zlib1g;;
   "focal") apt_install libc6 libgcc1 libgssapi-krb5-2 libicu66 libssl1.1 libstdc++6 zlib1g;;
+  "jammy") apt_install libc6 libgcc1 libgssapi-krb5-2 libicu70 libssl3 libstdc++6 zlib1g;;
   *)
     echo "Tool '${TOOL_NAME}' not supported on: ${version_codename}! Please use 'ubuntu' or 'bionic'." >&2
     exit 1

diff --git a/src/usr/local/buildpack/tools/powershell.sh b/src/usr/local/buildpack/tools/powershell.sh
@@ -23,6 +23,7 @@ if [[ -z "${tool_path}" ]]; then
   case "$version_codename" in
     "bionic") apt_install libc6 libgcc1 libgssapi-krb5-2 libicu60 libssl1.1 libstdc++6 zlib1g;;
     "focal") apt_install libc6 libgcc1 libgssapi-krb5-2 libicu66 libssl1.1 libstdc++6 zlib1g;;
+    "jammy") apt_install libc6 libgcc1 libgssapi-krb5-2 libicu70 libssl3 libstdc++6 zlib1g;;
     *)
       echo "Tool '${TOOL_NAME}' not supported on: ${version_codename}! Please use 'ubuntu' or 'bionic'." >&2
       exit 1

diff --git a/test/Dockerfile.jammy b/test/Dockerfile.jammy
@@ -29,7 +29,7 @@ FROM base as test
 ARG APT_HTTP_PROXY
 
 # renovate: datasource=docker lookupName=mcr.microsoft.com/dotnet/sdk versioning=docker
-#RUN install-tool dotnet 6.0.300
+RUN install-tool dotnet 6.0.300
 
 # renovate: datasource=github-releases lookupName=containerbase/erlang-prebuild versioning=docker
 #RUN install-tool erlang 24.3.4.0
@@ -68,7 +68,7 @@ RUN install-npm lerna 5.0.0
 #RUN install-tool composer 2.3.7
 
 # renovate: datasource=github-releases lookupName=PowerShell/PowerShell
-#RUN install-tool powershell v7.2.4
+RUN install-tool powershell v7.2.4
 
 # renovate: datasource=github-releases lookupName=containerbase/python-prebuild
 #RUN install-tool python 3.10.5