Skip to content
This repository was archived by the owner on Nov 30, 2023. It is now read-only.

Commit 28248d6

Browse files
authored
[codespaces] bump oryx to 20211210.1 (#1205)
* bump to 20211210.1 * jdk 17 is now already present * check for dotnet 6 in test.sh * bump definitionManifest
1 parent 1f305f7 commit 28248d6

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

containers/codespaces-linux/.devcontainer/base.Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright (c) Microsoft Corporation. All rights reserved.
33
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
44
#-------------------------------------------------------------------------------------------------------------
5-
FROM mcr.microsoft.com/oryx/build:vso-focal-20211102.1 as kitchensink
5+
FROM mcr.microsoft.com/oryx/build:vso-focal-20211210.1 as kitchensink
66

77
ARG USERNAME=codespace
88
ARG USER_UID=1000
@@ -97,10 +97,10 @@ RUN bash /tmp/scripts/node-debian.sh "${NVM_DIR}" "none" "${USERNAME}" \
9797
# Clean up
9898
&& rm -rf ${NVM_DIR}/.git ${NVS_HOME}/.git
9999

100-
# Install SDKMAN, OpenJDK8 (JDK 11 already present), gradle (maven already present)
100+
# Install SDKMAN, OpenJDK8 (JDK 17 already present), gradle (maven already present)
101101
RUN bash /tmp/scripts/gradle-debian.sh "latest" "${SDKMAN_DIR}" "${USERNAME}" "true" \
102102
&& su ${USERNAME} -c ". ${SDKMAN_DIR}/bin/sdkman-init.sh \
103-
&& sdk install java 11-opt-java /opt/java/11.0 \
103+
&& sdk install java 11-opt-java /opt/java/17.0 \
104104
&& sdk install java lts-opt-java /opt/java/lts"
105105

106106
# Install Rust, Go, remove scripts now that we're done with them

containers/codespaces-linux/definition-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"definitionVersion": "1.6.9",
2+
"definitionVersion": "1.7.0",
33
"build": {
44
"latest": true,
55
"rootDistro": "debian",

containers/codespaces-linux/test-project/test.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ check "oryx" oryx --version
1616
check "dotnet" dotnet --list-sdks
1717
check "oryx-install-dotnet-3.1.0" oryx prep --skip-detection --platforms-and-versions dotnet=3.1.0
1818
check "dotnet-3.1.0-installed" bash -c 'dotnet --info | grep -E "\s3\.1\.0\s"'
19+
check "dotnet-6-installed-by-oryx" dotnet --info | grep "/opt/dotnet/6\.0\.[0-9]*/sdk"
1920

2021
# Check Python
2122
check "python" python --version

0 commit comments

Comments
 (0)