Skip to content

Commit

Permalink
Update the salt-virt container to use a more recent version of Fedora
Browse files Browse the repository at this point in the history
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
  • Loading branch information
s0undt3ch committed Sep 22, 2023
1 parent 98611ef commit 5429b67
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 18 deletions.
2 changes: 1 addition & 1 deletion custom/virt-minion/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ if [[ -z "${HOST_UUID}" ]]; then
fi
echo "host_uuid = \"$HOST_UUID\"" >> /etc/libvirt/libvirtd.conf

pip install -e /salt
env USE_STATIC_REQUIREMENTS=1 pip3 install -e /salt
/usr/sbin/sshd
virtlogd -d

Expand Down
31 changes: 14 additions & 17 deletions custom/virt-minion/latest.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
FROM registry.fedoraproject.org/fedora:32
# Since 3006.x does not have Py3.11 linux requirements files, we need to stay on
# Fedora 36 so that we install Salt under Py3.10
FROM registry.fedoraproject.org/fedora:36

RUN dnf update -y && \
dnf install -y --setopt=tsflags=nodocs --setopt=install_weak_deps=False \
Expand All @@ -14,26 +16,21 @@ RUN dnf update -y && \
libgcrypt \
openssh-server \
openssh-clients \
make \
automake \
gcc \
gcc-c++ \
rustc \
cargo \
libffi-devel \
python3 \
python3-devel \
python3-pip \
python3-psutil \
python3-libvirt && \
dnf clean all && \
pip3 install --no-cache-dir \
msgpack==0.5.6 \
requests \
distro \
pycryptodomex \
MarkupSafe \
Jinja2 \
pyzmq \
PyYAML \
urllib3 \
chardet \
certifi \
looseversion \
tornado \
packaging
dnf clean all

RUN env USE_STATIC_REQUIREMENTS=1 pip3 install --no-cache-dir salt

RUN echo 'listen_tls = 1' >> /etc/libvirt/libvirtd.conf; \
echo 'listen_tcp = 1' >> /etc/libvirt/libvirtd.conf; \
Expand Down

0 comments on commit 5429b67

Please sign in to comment.