Skip to content

Commit 45e27e5

Browse files
authored
Update Docker image for v3.1 (#542)
Signed-off-by: Qi Zhang <[email protected]>
1 parent 08bb00e commit 45e27e5

File tree

5 files changed

+29
-64
lines changed

5 files changed

+29
-64
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@ This project supports below scenarios for end-to-end guest operating system vali
101101
This compatible guest operating systems list is used for this project only. For guest operating system support status on ESXi, please refer to [VMware Compatibility Guide](https://www.vmware.com/resources/compatibility/search.php?deviceCategory=software&testConfig=16).
102102

103103
### Docker images
104-
* Latest (Release v3.0):
104+
* Latest (Release v3.1):
105105
* projects.registry.vmware.com/gos_cert/ansible-vsphere-gos-validation:latest
106-
* Release v3.0:
107-
* projects.registry.vmware.com/gos_cert/ansible-vsphere-gos-validation:v3.0
106+
* Release v3.1:
107+
* projects.registry.vmware.com/gos_cert/ansible-vsphere-gos-validation:v3.1
108108

109109
Launch testing using Docker image
110110
1. Execute below commands in your machine

docker_file/Dockerfile

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# ansible-vsphere-gos-validation
22
# For users launch guest OS validation test on vSphere
3-
# version: 3.0
3+
# version: 3.1
44

5-
# Use latest Photon OS 4.0 docker image as parent image
6-
FROM photon:4.0
5+
# Use latest Photon OS docker image as parent image
6+
FROM photon:latest
77
WORKDIR /root/ansible-vsphere-gos-validation
88

99
# Install the required packages
@@ -13,8 +13,8 @@ RUN tdnf makecache && \
1313
python3-wheel python3-jmespath python3-netaddr && \
1414
pip3 install pycdlib pywinrm pyvmomi pypsrp passlib
1515

16-
# Install ansible-core (starts from Ansible 2.11)
17-
RUN pip3 install ansible-core
16+
# Install ansible-core
17+
RUN pip3 install ansible-core==2.15.8
1818

1919
# Install Ansible collections
2020
# You can set https proxy if collections are failed to install from Galaxy server, e.g.,
@@ -24,13 +24,12 @@ ENV LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8
2424
RUN ansible-galaxy collection install ansible.netcommon ansible.posix community.general community.vmware community.windows community.crypto
2525

2626
# Download latest 'ansible-vsphere-gos-validation' release to working dir
27-
RUN curl -s https://api.github.com/repos/vmware/ansible-vsphere-gos-validation/releases/latest | grep "tarball_url" | cut -d "\"" -f 4 | xargs -n 1 wget -O test.tar.gz && \
28-
tar -zxf test.tar.gz && \
29-
mv vmware-ansible-vsphere-gos-validation*/* ./
27+
RUN wget --no-check-certificate https://github.com/vmware/ansible-vsphere-gos-validation/archive/refs/heads/main.tar.gz -O /tmp/test.tar.gz && \
28+
tar -zxf /tmp/test.tar.gz -C /tmp && \
29+
mv /tmp/ansible-vsphere-gos-validation-main/* ./
3030

3131
# Clean up unused files
32-
RUN rm -rf test.tar.gz vmware-ansible-vsphere-gos-validation* && \
33-
tdnf clean all && \
32+
RUN tdnf clean all && \
3433
rm -rf /var/cache/* /root/.cache/pip/* /var/log/* /tmp/* /root/.ansible/tmp/*
3534

3635
# Known issue: ping: socket SOCK_DGRAM 1: Permission denied, Kernel bug workaround

docker_file/README.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# How to update docker image
2+
## Build docker image
3+
Build a new docker image with version tag vX.Y for latest release.
4+
```
5+
docker build . -t ansible-vsphere-gos-validation:vX.Y
6+
```
7+
8+
## Run docker container to test the new docker image
9+
```
10+
docker run -it --privileged ansible-vsphere-gos-validation:vX.Y
11+
```
12+
13+
## Tag the docker image as latest
14+
```
15+
docker image tag ansible-vsphere-gos-validation:vX.Y ansible-vsphere-gos-validation:latest
16+
```

docs/KNOWN_ISSUES.md

Lines changed: 0 additions & 50 deletions
This file was deleted.

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ pyvmomi
1313
passlib
1414
pytesseract
1515
Pillow
16-
ansible-core
16+
ansible-core==2.15.8

0 commit comments

Comments
 (0)