Fixed issue with build on amd64 for PS

Author: jmcombs

.github/workflows/docker-publish.yml

@@ -12,7 +12,7 @@ on:
 
 jobs:
   docker:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3

Dockerfile

@@ -90,8 +90,8 @@ RUN mkdir -p ${DOTNET_ROOT} \
 # apt package(s): ca-certificates, less, libssl1.1, libicu66, wget, unzip
 RUN PS_MAJOR_VERSION=$(curl -Ls -o /dev/null -w %{url_effective} https://aka.ms/powershell-release\?tag\=lts | cut -d 'v' -f 2 | cut -d '.' -f 1) \
     && PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_MAJOR_VERSION} \
-    && PS_PACKAGE=$(curl -Ls -o /dev/null -w %{url_effective} https://aka.ms/powershell-release\?tag\=lts | sed 's#https://github.com#https://api.github.com/repos#g; s#tag/#tags/#' | xargs curl -s | grep browser_download_url | grep linux-${PS_ARCH} | cut -d '"' -f 4 | xargs basename) \
-    && PS_PACKAGE_URL=$(curl -Ls -o /dev/null -w %{url_effective} https://aka.ms/powershell-release\?tag\=lts | sed 's#https://github.com#https://api.github.com/repos#g; s#tag/#tags/#' | xargs curl -s | grep browser_download_url | grep linux-${PS_ARCH} | cut -d '"' -f 4) \
+    && PS_PACKAGE=$(curl -Ls -o /dev/null -w %{url_effective} https://aka.ms/powershell-release\?tag\=lts | sed 's#https://github.com#https://api.github.com/repos#g; s#tag/#tags/#' | xargs curl -s | grep browser_download_url | grep linux-${PS_ARCH}.tar.gz | cut -d '"' -f 4 | xargs basename) \
+    && PS_PACKAGE_URL=$(curl -Ls -o /dev/null -w %{url_effective} https://aka.ms/powershell-release\?tag\=lts | sed 's#https://github.com#https://api.github.com/repos#g; s#tag/#tags/#' | xargs curl -s | grep browser_download_url | grep linux-${PS_ARCH}.tar.gz | cut -d '"' -f 4) \
     && curl -LO ${PS_PACKAGE_URL} \
     && mkdir -p ${PS_INSTALL_FOLDER} \
     && tar zxf ${PS_PACKAGE} -C ${PS_INSTALL_FOLDER} \

README.md

@@ -9,7 +9,7 @@ VMware's PowerCLI with PowerShell Core and Python for ImageBuilder Support in Li
 
 ## About
 
-This container is based on Ubuntu 20.04, contains the `mkisofs` package (for repacking ISO images) and has the following software installed, per the [Compatibility Matrixes for VMware PowerCLI 13.1.0](https://vdc-repo.vmware.com/vmwb-repository/dcr-public/f479301e-3164-47bc-9584-89b84a1bf5ce/c4ea2d2f-bf6d-4c18-bb20-6c4782ac6576/powercli1310-compat-matrix.html) and [Compatibility Matrixes for VMware PowerCLI 13.0.0](https://developer.vmware.com/docs/17472//powercli1300-compat-matrix.html#install-prereq):
+This container is based on Ubuntu 20.04, contains both `xorriso` and `mkisofs` packages (for repacking ISO images) and has the following software installed, per the [Compatibility Matrixes for VMware PowerCLI 13.1.0](https://vdc-repo.vmware.com/vmwb-repository/dcr-public/f479301e-3164-47bc-9584-89b84a1bf5ce/c4ea2d2f-bf6d-4c18-bb20-6c4782ac6576/powercli1310-compat-matrix.html) and [Compatibility Matrixes for VMware PowerCLI 13.0.0](https://developer.vmware.com/docs/17472//powercli1300-compat-matrix.html#install-prereq):
 
 - .NET Core 3.1 (which is now [End of Support](https://dotnet.microsoft.com/en-us/platform/support/policy/dotnet-core))
 - PowerShell Core 7.2 LTS (Automated)
@@ -19,7 +19,7 @@ This container is based on Ubuntu 20.04, contains the `mkisofs` package (for rep
 **NOTE**:
 
 - Python is configured per requirements outlined in [Install and Configure Python on Linux](https://developer.vmware.com/docs/15315/powercli-user-s-guide/GUID-101A5D2A-6BEB-43B0-8328-3B2F9F80C628.html)
-- For `ARM64` (aka Apple Silicone) users, there is a bug in PowerCLI 13.1.0 with ImageBuilder and it will not run so, `ARM64` images contain PowerCLI 13.0.0. Actively racking this issue down with VMware for resolution.
+- For `ARM64` (aka Apple Silicone) users, there is a bug in PowerCLI 13.1.0 with ImageBuilder and it will not run so, `ARM64` images contain PowerCLI 13.0.0. VMware states its due to one of their modules not being compiled for ARM and have provided no ETA on when they'll fix it. Until then, I am keeping PowerCLI 13.0.0 for ARM64 images.
 
 ## How to Use
 
@@ -37,13 +37,13 @@ For most use cases where the intent is to only use PowerCLI (without Image Build
 docker run -it jmcombs/vmware-powercli
 ```
 
-If the intent is to use PowerCLI with Image Builder, a volume will need to be mapped:
+If the intent is to use PowerCLI with Image Builder and use `xorriso` to repackage modified Images, a volume will need to be mapped:
 
 ```shell
 docker run -it --volume=/your/local/filesystem/files:/home/coder/files jmcombs/vmware-powercli
 ```
 
-If the intent is to use PowerCLI with Image Builder and use `mkisofs` to repackage modified Images, a volume will need to be mapped and it is required to run the container in Privileged Mode
+If the intent is to use PowerCLI with Image Builder and use `mkisofs` to repackage modified Images, a volume will need to be mapped `mkisofs` requires the container to be ran in Privileged Mode
 
 ```shell
 docker run -it --privileged --volume=/your/local/filesystem/files:/home/coder/files jmcombs/vmware-powercli
@@ -260,7 +260,88 @@ PS /home/coder/files> Export-EsxImageProfile -ImageProfile ESXi-7.0U3g-nuc12-syn
 
 10. Happy ESXi Installing!
 
-### Modify & Repackage ESXi ISO
+### Modify & Repackage ESXi ISO with `xorriso`
+
+The following are instructions for
+
+- This is the recommended approach
+- Mounting an ESXi ISO image
+- Copying ESXi ISO image to a temporary location (for modification) & Repackaging using `xorriso`
+
+#### **NOTE:** The example below:
+
+- Is using an ESXi `7.0U3g` ISO image created with Image Builder which includes [Community Networking Driver for ESXi](https://flings.vmware.com/community-networking-driver-for-esxi) and [Synology NFS Plug-in for VMware VAAI](https://kb.synology.com/en-us/DSM/tutorial/How_do_I_install_Synology_NFS_VAAI_Plug_in_on_an_ESXi_host) VIBs
+- Image Builder ISO file is named `VMware-VMvisor-Installer-7.0U3g-20328353.x86_64.nuc12-syn.iso`
+- Repackaged ISO file is named `custom_esxi.iso`
+- Location of files is in `/home/coder/files`
+
+#### **Assumptions:**
+
+- It is assumed the user knows how to modify an ESXi Image (adding Kickstart scripts, modifying `boot.cfg`, creating Boot Menus, etc.) and, as such, are not demonstrated below
+
+#### **Instructions**
+
+1. Verify ISO Information
+
+```shell
+isoinfo -d -i ./VMware-VMvisor-Installer-7.0U3g-20328353.x86_64.nuc12-syn.iso
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: ESXI-7.0U3G-NUC12-SYN
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: ESXIMAGE
+Copyright File id:
+Abstract File id:
+Bibliographic File id:
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 196201
+El Torito VD version 1 found, boot catalog is in sector 1419
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 4699 18073
+```
+
+2. Create temporary folder for ESXi Installer (for modifications to boot commands, adding kickstart scripts, adding boot loader menus, etc)
+
+```shell
+mkdir /home/coder/files/custom_esxi_cdrom/
+```
+
+3. Extract ESXi installer files from mounted ISO to temporary folder and change permissions (to enable editing):
+
+```shell
+osirrox -indev ./VMware-VMvisor-Installer-7.0U3l-21424296.x86_64.nuc-syn.iso -extract / ./custom_esxi_cdrom/
+chmod -R u+w /home/coder/files/custom_esxi_cdrom
+```
+
+4. Make changes to ESXi Installer
+5. Create new ESXi Installer ISO
+
+```shell
+cd /home/coder/files/custom_esxi_cdrom
+xorriso -as mkisofs -relaxed-filenames -joliet-long --norock -appid ESXIMAGE -volid ESXI70U3G_NUC12-SYN -output /home/coder/files/custom_esxi.iso -eltorito-boot ISOLINUX.BIN -eltorito-catalog BOOT.CAT -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -eltorito-platform 0xEF -e EFIBOOT.IMG -no-emul-boot /home/coder/files/custom_esxi_cdrom
+```
+
+**NOTE:** `--norock` is for ESXi Images only
+
+8. Happy ESXi Installing!
+
+### Modify & Repackage ESXi ISO with `mkisofs`
 
 The following are instructions for