Merge pull request devcontainers#178 from devcontainers/samruddhikhandale/update-universal

universal - fix oryx bug for Python projects

Author: samruddhikhandale

src/universal/.devcontainer/local-features/setup-user/install.sh

@@ -25,6 +25,9 @@ DEBIAN_FLAVOR="focal-scm"
 mkdir -p /opt/oryx && echo "vso-focal" > /opt/oryx/.imagetype
 echo "DEBIAN|${DEBIAN_FLAVOR}" | tr '[a-z]' '[A-Z]' > /opt/oryx/.ostype
 
+# Oryx expects the tool to be installed at `/opt/oryx` and looks for relevant files in there.
+ln -snf /usr/local/oryx/* /opt/oryx
+
 # For the universal image, oryx build tool installs the detected platforms in /home/codespace/*. Hence, linking current platforms to the /home/codespace/ path and adding it to the PATH.
 # This ensures that whatever platfornm versions oryx detects and installs are set as root.
 NODE_PATH="/home/codespace/.nodejs/current"
@@ -38,6 +41,7 @@ ln -snf /usr/local/php/current $PHP_PATH
 PYTHON_PATH="/home/codespace/.python/current"
 mkdir -p /home/codespace/.python
 ln -snf /usr/local/python/current $PYTHON_PATH
+ln -snf /usr/local/python /opt/python
 
 JAVA_PATH="/home/codespace/.java/current"
 mkdir -p /home/codespace/.java

src/universal/manifest.json

@@ -1,5 +1,5 @@
 {
-	"version": "2.0.21",
+	"version": "2.0.22",
 	"build": {
 		"latest": true,
 		"rootDistro": "debian",

src/universal/test-project/test.sh

@@ -37,7 +37,7 @@ check "pydocstyle" pydocstyle --version
 check "bandit" bandit --version
 check "virtualenv" virtualenv --version
 count=$(ls /usr/local/python | wc -l)
-expectedCount=3 # 2 version folders + 1 current folder which links to either one of the version
+expectedCount=4 # 2 version folders + 1 current folder which links to either one of the version + 1 folder generated by oryx build command
 checkVersionCount "two versions of python are present" $count $expectedCount
 echo $(echo "python versions" && ls -a /usr/local/python)
 echo $(echo "pip list" pip list)