From 4d098a88d6644fbab16aac617b01819ca2d0b8b4 Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Wed, 28 May 2025 14:42:34 +0000
Subject: [PATCH] Oryx - Pinning to a previous commit in repository

---
 src/oryx/devcontainer-feature.json | 2 +-
 src/oryx/install.sh                | 6 +++++-
 test/oryx/scenarios.json           | 8 ++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/oryx/devcontainer-feature.json b/src/oryx/devcontainer-feature.json
index 860a39003..7db676889 100644
--- a/src/oryx/devcontainer-feature.json
+++ b/src/oryx/devcontainer-feature.json
@@ -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",
diff --git a/src/oryx/install.sh b/src/oryx/install.sh
index cf67db6b1..64937dc12 100755
--- a/src/oryx/install.sh
+++ b/src/oryx/install.sh
@@ -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
diff --git a/test/oryx/scenarios.json b/test/oryx/scenarios.json
index d7a70f319..4b3643590 100644
--- a/test/oryx/scenarios.json
+++ b/test/oryx/scenarios.json
@@ -1,6 +1,6 @@
 {
     "install_dotnet_and_oryx": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "dotnet": {
                 "version": "8.0",
@@ -11,7 +11,7 @@
         }
     },
     "install_older_dotnet_and_oryx": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "dotnet": {
                 "version": "7.0"
@@ -20,7 +20,7 @@
         }
     },
     "install_prev_dotnet_and_oryx": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "dotnet": {
                 "version": "6.0"
@@ -29,7 +29,7 @@
         }
     },
     "test_python_project": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "python": {
                 "version": "3.10.4",