Merge pull request #12 from serbangeorge-m/add-windows-msi-installer

ci: add podman msi installer option

Author: cbr7

.github/actions/fetch-latest-podman-version-windows/action.yml

@@ -27,9 +27,9 @@ inputs:
     required: false
     default: 'amd64'
   file_type:
-    description: 'File type for Windows (setup.exe, installer.exe, remote.zip)'
+    description: 'File type for Windows (setup.exe, installer.exe, remote.zip, msi)'
     required: false
-    default: 'setup.exe'
+    default: 'msi'
   github_token:
     description: 'GitHub token to make authenticated API requests'
     required: false
@@ -152,9 +152,12 @@ runs:
           "remote.zip")
             DOWNLOAD_URL="https://github.com/containers/podman/releases/download/${LATEST_VERSION}/podman-remote-release-windows_${ARCHITECTURE}.zip"
             ;;
+          "msi")
+            DOWNLOAD_URL="https://github.com/containers/podman/releases/download/${LATEST_VERSION}/podman-installer-windows-${ARCHITECTURE}.msi"
+            ;;
           *)
             echo "Error: Unsupported Windows file type: $FILE_TYPE"
-            echo "Supported types: setup.exe, installer.exe, remote.zip"
+            echo "Supported types: setup.exe, installer.exe, remote.zip, msi"
             exit 1
             ;;
         esac

README.md

@@ -6,7 +6,7 @@ This composite action installs Podman on GitHub-hosted runners for both Linux (U
 
 The action is cross-platform, working for both ubuntu-latest and windows-latest runners.
 
-On Windows, it features a smart installer that automatically fetches the latest Podman version by default. However, you can also specify a specific version if your CI needs to be pinned to an older release. After installation, the action automatically runs podman machine init --now to ensure the Podman machine is running and ready for use in subsequent steps.
+On Windows, it uses the official Podman MSI installer, automatically fetching the latest version. You can specify a specific Podman version if your CI needs to be pinned. After installation, the action automatically runs podman machine init --now to ensure the Podman machine is running and ready for use in subsequent steps.
 
 On Linux, the action installs Podman v5.x and its key dependencies (like CRIU) from the openSUSE Kubic repository, ensuring you get a modern version.
 

action.yml

@@ -28,6 +28,10 @@ inputs:
     description: "Podman version for Windows. Use 'latest' or a specific version (e.g. '5.6.2')."
     required: false
     default: "latest"
+  install-scope:
+    description: "Installation scope for Windows MSI installer. Use 'user' for user-scope (no admin required) or 'machine' for machine-scope (requires admin privileges)."
+    required: false
+    default: "user"
   github-token:
     description: "GitHub token to make authenticated API requests and avoid rate limiting."
     required: false
@@ -73,7 +77,6 @@ runs:
       uses: redhat-actions/podman-install/.github/actions/fetch-latest-podman-version-windows@6b757b792b67ec663765a4f2ca36226e12b2f4cd
       with:
         version_input: ${{ inputs.podman-version-input || 'latest' }}
-        file_type: 'setup.exe'
         github_token: ${{ inputs.github-token }}
 
     - name: Install Podman on Windows
@@ -82,23 +85,63 @@ runs:
       run: |
         $downloadUrl = "${{ steps.fetch-podman-url.outputs.download_url }}"
         $podmanVersion = "${{ steps.fetch-podman-url.outputs.version }}"
+        $installScope = "${{ inputs.install-scope }}"
 
-        $versionNumber = $podmanVersion -replace '^v'
-        $fileName = "podman-$versionNumber-setup.exe"
+        $uri = [System.Uri]$downloadUrl
+        $fileName = Split-Path -Leaf $uri.AbsolutePath
 
         echo "Installing Podman version $podmanVersion..."
-        echo "Downloading from $downloadUrl file $fileName"
+        echo "Installation scope: $installScope"
+        echo "Downloading from $downloadUrl to $fileName"
         curl --output $fileName -L $downloadUrl
 
-        Start-Process -FilePath ".\$fileName" -ArgumentList "/install", "/passive", "/norestart", "/log podman-logs.txt" -Wait
-        Get-Content podman-logs.txt
+        if ($fileName -match '\.msi$') {
+          $msiArgs = @("/package", "$PWD\$fileName", "/quiet", "/norestart", "/l*v", "podman-msi.log")
+          if ($installScope -eq "machine") {
+            echo "Installing at machine-scope (requires admin privileges)..."
+            $msiArgs += "ALLUSERS=1"
+          } else {
+            echo "Installing at user-scope (no admin required)..."
+          }
+          Start-Process msiexec -ArgumentList $msiArgs -Wait
+        } else {
+          Start-Process -FilePath ".\$fileName" -ArgumentList "/install", "/passive", "/norestart", "/log podman-logs.txt" -Wait
+        }
+        if ($fileName -match '\.msi$' -and (Test-Path podman-msi.log)) {
+          Get-Content podman-msi.log
+        } elseif (Test-Path podman-logs.txt) {
+          Get-Content podman-logs.txt
+        }
 
     - name: Initialize Podman Machine on Windows
       if: runner.os == 'Windows'
       shell: pwsh
       run: |
+        $installScope = "${{ inputs.install-scope }}"
+        
         echo "Adding Podman to PATH for this session..."
-        $env:PATH += ";C:\Program Files\RedHat\Podman"
+        # New MSI installer locations (user-scope and machine-scope)
+        $userScopePath = "$env:LOCALAPPDATA\Programs\Podman"
+        $machineScopePath = "$env:ProgramFiles\Podman"
+        # Legacy installer location (for backward compatibility)
+        $legacyPath = "$env:ProgramFiles\RedHat\Podman"
+        
+        # Check based on install scope first, then fall back to other locations
+        if ($installScope -eq "machine" -and (Test-Path $machineScopePath)) {
+          $env:PATH += ";$machineScopePath"
+        } elseif ($installScope -eq "user" -and (Test-Path $userScopePath)) {
+          $env:PATH += ";$userScopePath"
+        } elseif (Test-Path $userScopePath) {
+          $env:PATH += ";$userScopePath"
+        } elseif (Test-Path $machineScopePath) {
+          $env:PATH += ";$machineScopePath"
+        } elseif (Test-Path $legacyPath) {
+          $env:PATH += ";$legacyPath"
+        }
+        
+        $podmanPath = (Get-Command podman).Path
+        echo "Podman installed at: $podmanPath"
+        
         podman --version
         echo "Initializing Podman machine..."
         podman machine init --now