Skip to content

Commit

Permalink
Update native image to support netutils image (#20009)
Browse files Browse the repository at this point in the history
* lock pycti to 5.9.6

* update comment

* CR change

* added support for the image netutils

* remove netutils verify

* make verify symlink
  • Loading branch information
ilappe authored Sep 14, 2023
1 parent 0bded98 commit 8e514b3
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 7 deletions.
1 change: 1 addition & 0 deletions docker/py3-native/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* Added *jq* as a build dependency and updated chromedriver download script to be in line with chromium.
* Updated py3-native to be based on ubi-9.2.
* Downgraded the *LibreOffice* to the following version: **7.1.8** to avoid installing it directly from the source.
* Added support for the **netutils** image.

## 8.3.0
* Updated the *LibreOffice* to the following version: **7.5.3**
Expand Down
2 changes: 1 addition & 1 deletion docker/py3-native/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN dnf update --nodocs -y \
&& rpm --import RPM-GPG-KEY-CentOS-Official \
&& mv repos/* /etc/yum.repos.d/ \
&& dnf install -y --nodocs python3-devel gcc gcc-c++ make wget git unzip llvm-libs libXpm iproute jq \
&& dnf install -y --nodocs --enablerepo=$ROCKY_BASE --enablerepo=$ROCKY_RELEASE tigervnc-server-minimal xorg-x11-utils google-chrome-stable \
&& dnf install -y --nodocs --enablerepo=$ROCKY_BASE --enablerepo=$ROCKY_RELEASE tigervnc-server-minimal xorg-x11-utils google-chrome-stable iputils nmap bind-utils \
&& dnf install -y --nodocs --enablerepo=$ROCKY_BASE --enablerepo=$ROCKY_RELEASE --enablerepo=$FEDORA_EPEL ImageMagick \
&& ./download_chromedriver.sh \
&& unzip chromedriver-linux64.zip \
Expand Down
2 changes: 2 additions & 0 deletions docker/py3-native/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ This README purpose is to clarify the following:
* joe-security
* slack
* office-utils
* netutils
## Verifiers Folder
Expand Down Expand Up @@ -131,6 +132,7 @@ That is done in order to keep updated with the python dependencies the original
* **joe-security:** python3-devel gcc gcc-c++ make wget git
* **slack:** python3-devel gcc gcc-c++ make wget git libffi
* **office-utils:** LibreOffice_Linux_x86-64_rpm java-11-openjdk-headless cairo libSM libX11-xcb
* **netutils:** curl bind-utils openssl iputils nmap
## Good To Know
* The packages that are being removed by `dnf remove` at the end are packages that are required **only** during the installation of python dependencies, once the python packages are installed they can be removed.
Expand Down
33 changes: 27 additions & 6 deletions docker/py3-native/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions docker/py3-native/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ python-whois = "*"
ipwhois = "*"
edgegrid-python = "*"
tldextract = "*"
requests = {extras = ["socks"],version = "*"}
netaddr = "*"
python-libnmap = "*"
websockets = "*"
dnspython = "*"

[build-system]
requires = ["poetry-core"]
Expand Down
1 change: 1 addition & 0 deletions docker/py3-native/verifiers/netutils_verify.py

0 comments on commit 8e514b3

Please sign in to comment.