Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/oryx/devcontainer-feature.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "oryx",
"version": "1.4.1",
"version": "1.4.2",
"name": "Oryx",
"description": "Installs the oryx CLI",
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/oryx",
Expand Down
6 changes: 5 additions & 1 deletion src/oryx/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,11 @@ GIT_ORYX=/opt/tmp/oryx-repo
mkdir -p ${BUILD_SCRIPT_GENERATOR}
mkdir -p ${ORYX}

git clone --depth=1 https://github.com/microsoft/Oryx $GIT_ORYX
# https://github.com/microsoft/Oryx/commit/aa205b50896b2174c0d0d8be1c9e94684aab1e9a is breaking the `oryx` tool
# Pinning to a previous working commit until the upstream issue is fixed.
git clone https://github.com/microsoft/Oryx $GIT_ORYX
cd $GIT_ORYX
git reset --hard cada9e85564f034d18420f8b5b38b3cf2259f321

if [[ "${PINNED_SDK_VERSION}" != "" ]]; then
cd $GIT_ORYX
Expand Down
8 changes: 4 additions & 4 deletions test/oryx/scenarios.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"install_dotnet_and_oryx": {
"image": "ubuntu:focal",
"image": "ubuntu:noble",
"features": {
"dotnet": {
"version": "8.0",
Expand All @@ -11,7 +11,7 @@
}
},
"install_older_dotnet_and_oryx": {
"image": "ubuntu:focal",
"image": "ubuntu:noble",
"features": {
"dotnet": {
"version": "7.0"
Expand All @@ -20,7 +20,7 @@
}
},
"install_prev_dotnet_and_oryx": {
"image": "ubuntu:focal",
"image": "ubuntu:noble",
"features": {
"dotnet": {
"version": "6.0"
Expand All @@ -29,7 +29,7 @@
}
},
"test_python_project": {
"image": "ubuntu:focal",
"image": "ubuntu:noble",
"features": {
"python": {
"version": "3.10.4",
Expand Down