Skip to content

Commit 4d098a8

Browse files
committed
Oryx - Pinning to a previous commit in repository
1 parent 94ed0bb commit 4d098a8

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

src/oryx/devcontainer-feature.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "oryx",
3-
"version": "1.4.1",
3+
"version": "1.4.2",
44
"name": "Oryx",
55
"description": "Installs the oryx CLI",
66
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/oryx",

src/oryx/install.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,11 @@ GIT_ORYX=/opt/tmp/oryx-repo
177177
mkdir -p ${BUILD_SCRIPT_GENERATOR}
178178
mkdir -p ${ORYX}
179179

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

182186
if [[ "${PINNED_SDK_VERSION}" != "" ]]; then
183187
cd $GIT_ORYX

test/oryx/scenarios.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"install_dotnet_and_oryx": {
3-
"image": "ubuntu:focal",
3+
"image": "ubuntu:noble",
44
"features": {
55
"dotnet": {
66
"version": "8.0",
@@ -11,7 +11,7 @@
1111
}
1212
},
1313
"install_older_dotnet_and_oryx": {
14-
"image": "ubuntu:focal",
14+
"image": "ubuntu:noble",
1515
"features": {
1616
"dotnet": {
1717
"version": "7.0"
@@ -20,7 +20,7 @@
2020
}
2121
},
2222
"install_prev_dotnet_and_oryx": {
23-
"image": "ubuntu:focal",
23+
"image": "ubuntu:noble",
2424
"features": {
2525
"dotnet": {
2626
"version": "6.0"
@@ -29,7 +29,7 @@
2929
}
3030
},
3131
"test_python_project": {
32-
"image": "ubuntu:focal",
32+
"image": "ubuntu:noble",
3333
"features": {
3434
"python": {
3535
"version": "3.10.4",

0 commit comments

Comments
 (0)