diff --git a/Dockerfile.ocp b/Dockerfile.ocp index a6c339c..b765427 100644 --- a/Dockerfile.ocp +++ b/Dockerfile.ocp @@ -1,11 +1,12 @@ FROM ubi8 -RUN yum update -y && \ - yum install -y openstack-ironic-inspector crudini psmisc iproute iptables sqlite && \ - yum clean all - -RUN mkdir -p /var/lib/ironic-inspector && \ - sqlite3 /var/lib/ironic-inspector/ironic-inspector.db "pragma journal_mode=wal" +RUN dnf update -y && \ + dnf install -y openstack-ironic-inspector crudini psmisc iproute sqlite && \ + mkdir -p /var/lib/ironic-inspector && \ + sqlite3 /var/lib/ironic-inspector/ironic-inspector.db "pragma journal_mode=wal" && \ + dnf remove -y sqlite && \ + dnf clean all && \ + rm -rf /var/cache/{yum,dnf}/* COPY ./inspector.conf /tmp/inspector.conf RUN crudini --merge /etc/ironic-inspector/inspector.conf < /tmp/inspector.conf && \ diff --git a/runironic-inspector.sh b/runironic-inspector.sh index ab2fdb3..73c9d8c 100755 --- a/runironic-inspector.sh +++ b/runironic-inspector.sh @@ -6,19 +6,6 @@ CONFIG=/etc/ironic-inspector/inspector.conf wait_for_interface_or_ip -# Allow access to Ironic inspector API -if ! iptables -C INPUT -i "$PROVISIONING_INTERFACE" -p tcp -m tcp --dport 5050 -j ACCEPT > /dev/null 2>&1; then - iptables -I INPUT -i "$PROVISIONING_INTERFACE" -p tcp -m tcp --dport 5050 -j ACCEPT -fi - -# Allow access to mDNS -if ! iptables -C INPUT -i $PROVISIONING_INTERFACE -p udp --dport 5353 -j ACCEPT > /dev/null 2>&1; then - iptables -I INPUT -i $PROVISIONING_INTERFACE -p udp --dport 5353 -j ACCEPT -fi -if ! iptables -C OUTPUT -p udp --dport 5353 -j ACCEPT > /dev/null 2>&1; then - iptables -I OUTPUT -p udp --dport 5353 -j ACCEPT -fi - # Remove log files from last deployment rm -rf /shared/log/ironic-inspector @@ -28,8 +15,7 @@ cp $CONFIG $CONFIG.orig crudini --set $CONFIG ironic endpoint_override http://$IRONIC_URL_HOST:6385 crudini --set $CONFIG service_catalog endpoint_override http://$IRONIC_URL_HOST:5050 -crudini --set $CONFIG mdns interfaces $PROVISIONING_IP exec /usr/bin/ironic-inspector --config-file /etc/ironic-inspector/inspector-dist.conf \ --config-file /etc/ironic-inspector/inspector.conf \ - --log-file /shared/log/ironic-inspector/ironic-inspector.log + --log-file /shared/log/ironic-inspector/ironic-inspector.log \ No newline at end of file