From b075817a52d5b8cc7053759c8df1cebf32366ab1 Mon Sep 17 00:00:00 2001 From: Prashanth684 Date: Thu, 22 Aug 2024 12:01:51 -0700 Subject: [PATCH] fix scos and fcos dockerfiles to remove ironic-inspector https://github.com/openshift/ironic-image/pull/532 removes ironic inspector but missed scos and fcos dockerfiles --- Dockerfile.fcos | 7 +------ Dockerfile.scos | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Dockerfile.fcos b/Dockerfile.fcos index 3c403f89e..1126e1a21 100644 --- a/Dockerfile.fcos +++ b/Dockerfile.fcos @@ -42,15 +42,10 @@ COPY ironic-config/apache2-vmedia.conf.j2 /etc/httpd-vmedia.conf.j2 COPY ironic-config/apache2-proxy.conf.j2 /etc/httpd-proxy.conf.j2 COPY ironic-config/apache2-ipxe.conf.j2 /etc/httpd-ipxe.conf.j2 -RUN mkdir -p /var/lib/ironic /var/lib/ironic-inspector && \ +RUN mkdir -p /var/lib/ironic && \ sqlite3 /var/lib/ironic/ironic.db "pragma journal_mode=wal" && \ - sqlite3 /var/lib/ironic-inspector/ironic-inspector.db "pragma journal_mode=wal" && \ dnf remove -y sqlite -# IRONIC-INSPECTOR # -COPY ironic-inspector-config/ironic-inspector.conf.j2 /etc/ironic-inspector/ -COPY ironic-inspector-config/inspector-apache.conf.j2 /etc/httpd/conf.d/ - # configure non-root user and set relevant permissions RUN configure-nonroot.sh && \ rm -f /bin/configure-nonroot.sh diff --git a/Dockerfile.scos b/Dockerfile.scos index 6d0c88b80..aff3f7a91 100644 --- a/Dockerfile.scos +++ b/Dockerfile.scos @@ -42,15 +42,10 @@ COPY ironic-config/apache2-vmedia.conf.j2 /etc/httpd-vmedia.conf.j2 COPY ironic-config/apache2-proxy.conf.j2 /etc/httpd-proxy.conf.j2 COPY ironic-config/apache2-ipxe.conf.j2 /etc/httpd-ipxe.conf.j2 -RUN mkdir -p /var/lib/ironic /var/lib/ironic-inspector && \ +RUN mkdir -p /var/lib/ironic && \ sqlite3 /var/lib/ironic/ironic.db "pragma journal_mode=wal" && \ - sqlite3 /var/lib/ironic-inspector/ironic-inspector.db "pragma journal_mode=wal" && \ dnf remove -y sqlite -# IRONIC-INSPECTOR # -COPY ironic-inspector-config/ironic-inspector.conf.j2 /etc/ironic-inspector/ -COPY ironic-inspector-config/inspector-apache.conf.j2 /etc/httpd/conf.d/ - # configure non-root user and set relevant permissions RUN configure-nonroot.sh && \ rm -f /bin/configure-nonroot.sh