From a94558576cea2cb27d6cb9de331d21413ec7abb0 Mon Sep 17 00:00:00 2001 From: Samruddhi Khandale Date: Tue, 1 Nov 2022 11:28:41 -0700 Subject: Oryx - git clone: Pin to an older commit (#253) pin: git clone --- src/oryx/devcontainer-feature.json | 2 +- src/oryx/install.sh | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/oryx/devcontainer-feature.json b/src/oryx/devcontainer-feature.json index ba80780..741862f 100644 --- a/src/oryx/devcontainer-feature.json +++ b/src/oryx/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "oryx", - "version": "1.0.9", + "version": "1.0.10", "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 054983a..f613cf0 100755 --- a/src/oryx/install.sh +++ b/src/oryx/install.sh @@ -146,7 +146,12 @@ 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 +git clone https://github.com/microsoft/Oryx $GIT_ORYX +cd $GIT_ORYX + +# https://github.com/microsoft/Oryx/commit/74e4830b3636e5cfbce5b3e3358bd5bb66a87f45 is breaking the `oryx` tool +# Pinning to a previous working commit until the upstream issue is fixed. +git reset --hard 2b19efca9729673fc259e6a817be3cc0bb73b9d5 $GIT_ORYX/build/buildSln.sh -- cgit v1.2.3