aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamruddhi Khandale <skhandale@microsoft.com>2022-11-16 21:49:06 +0300
committerGitHub <noreply@github.com>2022-11-16 21:49:06 +0300
commitbff31788373499fdc903bad8f1b300d579c42d39 (patch)
tree58b99148c06a19ff0b054c72b18fdae32adafac5
parent1e35500bda4b00fadc1b2881865ad3cffaa69ff8 (diff)
Oryx: Unpin git clone from a single commit (#296)
-rw-r--r--src/oryx/devcontainer-feature.json2
-rwxr-xr-xsrc/oryx/install.sh7
2 files changed, 2 insertions, 7 deletions
diff --git a/src/oryx/devcontainer-feature.json b/src/oryx/devcontainer-feature.json
index 741862f..2596bd9 100644
--- a/src/oryx/devcontainer-feature.json
+++ b/src/oryx/devcontainer-feature.json
@@ -1,6 +1,6 @@
{
"id": "oryx",
- "version": "1.0.10",
+ "version": "1.0.11",
"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 f613cf0..054983a 100755
--- a/src/oryx/install.sh
+++ b/src/oryx/install.sh
@@ -146,12 +146,7 @@ GIT_ORYX=/opt/tmp/oryx-repo
mkdir -p ${BUILD_SCRIPT_GENERATOR}
mkdir -p ${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 clone --depth=1 https://github.com/microsoft/Oryx $GIT_ORYX
$GIT_ORYX/build/buildSln.sh