[oryx] - Publish Oryx for the host architecture (arm64 support)

.github/workflows/test-pr-arm64.yaml

@@ -9,7 +9,9 @@ on:
       - "src/powershell/**"
       - "test/powershell/**"
       - "src/docker-in-docker/**"
-      - "test/docker-in-docker/**"      
+      - "test/docker-in-docker/**"
+      - "src/oryx/**"
+      - "test/oryx/**"
 
 jobs:
   detect-changes:
@@ -26,6 +28,7 @@ jobs:
           filters: |
             powershell: ./**/powershell/**
             docker-in-docker: ./**/docker-in-docker/**
+            oryx: ./**/oryx/**
 
   test:
     needs: [detect-changes]
@@ -49,7 +52,11 @@ jobs:
           - features: docker-in-docker
             baseImage: mcr.microsoft.com/devcontainers/base:debian
           - features: docker-in-docker
-            baseImage: mcr.microsoft.com/devcontainers/base:ubuntu       
+            baseImage: mcr.microsoft.com/devcontainers/base:ubuntu
+          - features: oryx
+            baseImage: ubuntu:jammy
+          - features: oryx
+            baseImage: mcr.microsoft.com/devcontainers/base:ubuntu
     steps:
       - uses: actions/checkout@v7
 

src/oryx/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
     "id": "oryx",
-    "version": "2.0.2",
+    "version": "2.0.3",
     "name": "Oryx",
     "description": "Installs the oryx CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/oryx",

src/oryx/install.sh

@@ -116,6 +116,16 @@ install_dotnet_using_apt() {
 . /etc/os-release
 architecture="$(dpkg --print-architecture)"
 
+# Publish Oryx for the architecture it will run on
+case "${architecture}" in
+    amd64) DOTNET_RUNTIME_ID="linux-x64" ;;
+    arm64) DOTNET_RUNTIME_ID="linux-arm64" ;;
+    *)
+        echo "(!) Architecture ${architecture} unsupported"
+        exit 1
+        ;;
+esac
+
 # Currently, oryx is not supported with "jammy"
 if [[ "jammy" = *"${VERSION_CODENAME}"* ]]; then
     echo "(!) Unsupported distribution version '${VERSION_CODENAME}'."
@@ -188,8 +198,8 @@ echo "Publishing Oryx applications..."
 
 cd $GIT_ORYX
 
-${DOTNET_BINARY} publish -p:NuGetAudit=false -property:ValidateExecutableReferencesMatchSelfContained=false -r linux-x64 -o ${BUILD_SCRIPT_GENERATOR} -c Release $GIT_ORYX/src/BuildScriptGeneratorCli/BuildScriptGeneratorCli.csproj --self-contained true
-${DOTNET_BINARY} publish -p:NuGetAudit=false -r linux-x64 -o ${BUILD_SCRIPT_GENERATOR} -c Release $GIT_ORYX/src/BuildServer/BuildServer.csproj --self-contained true
+${DOTNET_BINARY} publish -p:NuGetAudit=false -property:ValidateExecutableReferencesMatchSelfContained=false -r ${DOTNET_RUNTIME_ID} -o ${BUILD_SCRIPT_GENERATOR} -c Release $GIT_ORYX/src/BuildScriptGeneratorCli/BuildScriptGeneratorCli.csproj --self-contained true
+${DOTNET_BINARY} publish -p:NuGetAudit=false -r ${DOTNET_RUNTIME_ID} -o ${BUILD_SCRIPT_GENERATOR} -c Release $GIT_ORYX/src/BuildServer/BuildServer.csproj --self-contained true
 
 find "${BUILD_SCRIPT_GENERATOR}" -maxdepth 1 -type f \
     \( -name '*.pdb' -o -name 'Microsoft.Oryx.*.xml' -o -name 'GenerateBuildScript.xml' \) -delete

test/oryx/test.sh

@@ -5,7 +5,29 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
+# Checks if packages are installed and installs them if not
+check_packages() {
+    if ! dpkg -s "$@" > /dev/null 2>&1; then
+        local sudo_cmd=""
+        if [ "$(id -u)" -ne 0 ]; then
+            sudo_cmd="sudo"
+        fi
+        ${sudo_cmd} apt-get update -y
+        ${sudo_cmd} apt-get -y install --no-install-recommends "$@"
+    fi
+}
+
+check_packages file
+
 check "Oryx version" oryx --version
+check "oryx-binary-matches-architecture" bash -c '
+	case "$(uname -m)" in
+		x86_64) expected="x86-64" ;;
+		aarch64) expected="ARM aarch64" ;;
+		*) exit 1 ;;
+	esac
+	file -L "$(command -v oryx)" | grep -q "${expected}"
+'
 check "ORYX_SDK_STORAGE_BASE_URL" echo $ORYX_SDK_STORAGE_BASE_URL
 check "ENABLE_DYNAMIC_INSTALL" echo $ENABLE_DYNAMIC_INSTALL