Merge branch 'main' into platform-automation-toolkit

laidbackware · Dec 4, 2024 · 1d92046 · 1d92046
2 parents 44bee58 + 6199865
commit 1d92046
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -147,14 +147,14 @@ From the root of the repo. Note no-cache flag used to force builds to pickup any
 One time build setup process on debian systems:
 
 ```sh
-sudo apt-get install qemu binfmt-support qemu-user-static
+sudo apt-get install qemu-system binfmt-support qemu-user-static
 docker buildx create --use --name multi-arch --driver docker-container --platform linux/amd64,linux/arm64
 ```
 
 Build command:
 
 ```sh
-docker buildx build --push --platform linux/arm64,linux/amd64 --tag laidbackware/vmware-lab-builder:v11 ./docker
+docker buildx build --push --platform linux/arm64,linux/amd64 --tag laidbackware/vmware-lab-builder:v11 --load ./docker
 ```
 
 ## Local Usage

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -35,7 +35,7 @@ RUN set -xe \
         git+https://github.com/vmware/vsphere-automation-sdk-python.git --break-system-packages \
     \
     && echo "****** Adding community.vmware from Ansible Galaxy ******" \
-    && ansible-galaxy collection install community.vmware:3.0.0 \
+    && ansible-galaxy collection install community.vmware:5.1.0 \
     \
     && echo "****** Adding community.crypto from Ansible Galaxy ******" \
     && ansible-galaxy collection install community.crypto \
@@ -46,6 +46,15 @@ RUN set -xe \
     && echo "****** Adding vmware.avi from Ansible Galaxy ******" \
     && ansible-galaxy collection install vmware.alb:22.1.4 \
     \
+    && echo "****** Adding ansible.utils from Ansible Galaxy ******" \
+    && ansible-galaxy collection install ansible.utils \
+    \
+    && echo "****** Adding community.crypto from Ansible Galaxy ******" \
+    && ansible-galaxy collection install community.crypto \
+    \
+    && echo "****** Adding community.general from Ansible Galaxy ******" \
+    && ansible-galaxy collection install community.general \
+    \
     && echo "****** Adding ansible-for-nsxt from Github ******" \
     && ansible-galaxy collection install git+https://github.com/laidbackware/ansible-for-nsxt.git,upstream-fixes --force \
     \