reformat Dockerfile

tgoetheyn · Mar 14, 2018 · 49d21a4 · 49d21a4
1 parent 4a84408
commit 49d21a4
Showing 1 changed file with 49 additions and 24 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,39 +3,64 @@ MAINTAINER cbpeckles
 
 # get stuff from the interwebs
 RUN yum -y install wget tar; yum clean all
-WORKDIR /tmp
-RUN wget https://assets.nagios.com/downloads/nagiosxi/5/xi-5.4.13.tar.gz -O xi-latest.tar.gz
-RUN tar xzf xi-latest.tar.gz
-WORKDIR nagiosxi
+RUN wget https://assets.nagios.com/downloads/nagiosxi/5/xi-5.4.13.tar.gz -O /tmp/xi-latest.tar.gz \
+    | tar xzC /tmp/nagiosxi
 
 # overwrite custom config file
 ADD config.cfg xi-sys.cfg
 
 # start building
-RUN ./init.sh && . ./xi-sys.cfg && umask 0022 && . ./functions.sh && log="install.log"
-RUN export INTERACTIVE="False" && export INSTALL_PATH=`pwd`
-RUN . ./functions.sh && run_sub ./0-repos noupdate
-RUN . ./functions.sh && run_sub ./1-prereqs
-RUN . ./functions.sh && run_sub ./2-usersgroups
-RUN . ./functions.sh && run_sub ./3-dbservers
-RUN . ./functions.sh && run_sub ./4-services
-RUN . ./functions.sh && run_sub ./5-sudoers
+RUN ./init.sh \
+    && . ./xi-sys.cfg \
+	&& umask 0022 \
+	&& . ./functions.sh \
+	&& log="install.log"
+RUN export INTERACTIVE="False" \
+    && export INSTALL_PATH=`pwd`
+RUN . ./functions.sh \
+    && run_sub ./0-repos noupdate
+RUN . ./functions.sh \
+    && run_sub ./1-prereqs
+RUN . ./functions.sh \
+    && run_sub ./2-usersgroups
+RUN . ./functions.sh \
+    && run_sub ./3-dbservers
+RUN . ./functions.sh \
+    && run_sub ./4-services
+RUN . ./functions.sh \
+    && run_sub ./5-sudoers
 RUN sed -i.bak s/selinux/sudoers/g 9-dbbackups
-RUN . ./functions.sh && run_sub ./9-dbbackups
-RUN . ./functions.sh && run_sub ./10-phplimits
-RUN . ./functions.sh && run_sub ./11-sourceguardian
-RUN . ./functions.sh && run_sub ./12-mrtg
-RUN . ./functions.sh && run_sub ./13-timezone
+RUN . ./functions.sh \
+    && run_sub ./9-dbbackups
+RUN . ./functions.sh \
+    && run_sub ./10-phplimits
+RUN . ./functions.sh \
+    && run_sub ./11-sourceguardian
+RUN . ./functions.sh \
+    && run_sub ./12-mrtg
+RUN . ./functions.sh \
+    && run_sub ./13-timezone
 
 ADD scripts/NDOUTILS-POST subcomponents/ndoutils/post-install
 ADD scripts/install subcomponents/ndoutils/install
-RUN chmod 755 subcomponents/ndoutils/post-install && chmod 755 subcomponents/ndoutils/install && . ./functions.sh && run_sub ./A-subcomponents
-RUN service mysqld start && . ./functions.sh && run_sub ./B-installxi
-RUN . ./functions.sh && run_sub ./C-cronjobs
-RUN . ./functions.sh && run_sub ./D-chkconfigalldaemons
-RUN service mysqld start && . ./functions.sh && run_sub ./E-importnagiosql
-RUN . ./functions.sh && run_sub ./F-startdaemons
-RUN . ./functions.sh && run_sub ./Z-webroot
+RUN chmod 755 subcomponents/ndoutils/post-install \
+    && chmod 755 subcomponents/ndoutils/install \
+	&& . ./functions.sh \
+	&& run_sub ./A-subcomponents
+RUN service mysqld start \
+    && . ./functions.sh \
+	&& run_sub ./B-installxi
+RUN . ./functions.sh \
+    && run_sub ./C-cronjobs
+RUN . ./functions.sh \
+    && run_sub ./D-chkconfigalldaemons
+RUN service mysqld start \
+    && . ./functions.sh \
+	&& run_sub ./E-importnagiosql
+RUN . ./functions.sh \
+    && run_sub ./F-startdaemons
+RUN . ./functions.sh \
+    && run_sub ./Z-webroot
 
 # set startup script
 ADD start.sh /start.sh