Merge pull request openshift#249 from elfosardo/split-ironic-conf

Move ironic specific config to ironic Dockerfile
e-minguez · Mar 29, 2021 · 255174b · 255174b
2 parents 26393f5 + cf5ce7a
commit 255174b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -41,6 +41,10 @@ COPY prepare-image.sh patch-image.sh /bin/
 RUN prepare-image.sh && \
   rm -f /bin/prepare-image.sh
 
+RUN chown ironic:ironic /var/log/ironic && \
+  # This file is generated after installing mod_ssl and it affects our configuration
+  rm -f /etc/httpd/conf.d/ssl.conf
+
 COPY --from=ironic-builder /tmp/ipxe/src/bin/undionly.kpxe /tmp/ipxe/src/bin-x86_64-efi/snponly.efi /tmp/ipxe/src/bin-x86_64-efi/ipxe.efi /tftpboot/
 
 COPY --from=ironic-builder /tmp/esp.img /tmp/uefi_esp.img

diff --git a/prepare-image.sh b/prepare-image.sh
@@ -24,5 +24,3 @@ if [[ ! -z ${PATCH_LIST:-} ]]; then
 fi
 rm -f /bin/patch-image.sh
 
-chown ironic:ironic /var/log/ironic
-rm /etc/httpd/conf.d/ssl.conf # This file is generated after installing mod_ssl and it affects our configuration