Tidy up files for container - also added a chmod +x to files for Jaso…

…nRivers#52
vikas99341 · Feb 20, 2018 · 7a620ee · 7a620ee
1 parent dfa70e0
commit 7a620ee
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 15 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -197,13 +197,7 @@ RUN rm -rf /etc/rsyslog.d /etc/rsyslog.conf
 
 RUN rm -rf /etc/sv/getty-5
 
-ADD nagios/nagios.cfg /opt/nagios/etc/nagios.cfg
-ADD nagios/cgi.cfg /opt/nagios/etc/cgi.cfg
-ADD nagios/templates.cfg /opt/nagios/etc/objects/templates.cfg
-ADD nagios/commands.cfg /opt/nagios/etc/objects/commands.cfg
-ADD nagios/localhost.cfg /opt/nagios/etc/objects/localhost.cfg
-
-ADD rsyslog/rsyslog.conf /etc/rsyslog.conf
+ADD overlay /
 
 RUN echo "use_timezone=${NAGIOS_TIMEZONE}" >> /opt/nagios/etc/nagios.cfg
 
@@ -219,14 +213,12 @@ RUN a2enmod session         && \
     a2enmod auth_form       && \
     a2enmod request
 
-ADD nagios.init /etc/sv/nagios/run
-ADD apache.init /etc/sv/apache/run
-ADD postfix.init /etc/sv/postfix/run
-ADD rsyslog.init /etc/sv/rsyslog/run
-ADD start.sh /usr/local/bin/start_nagios
-RUN chmod +x /usr/local/bin/start_nagios
-
-ADD fix-nagiosgraph-multiple-selection.sh /opt/nagiosgraph/etc
+RUN chmod +x /usr/local/bin/start_nagios        && \
+    chmod +x /etc/sv/apache/run                 && \
+    chmod +x /etc/sv/nagios/run                 && \
+    chmod +x /etc/sv/postfix/run                 && \
+    chmod +x /etc/sv/rsyslog/run                 && \
+    chmod +x /opt/nagiosgraph/etc/fix-nagiosgraph-multiple-selection.sh
 
 RUN cd /opt/nagiosgraph/etc && \
     sh fix-nagiosgraph-multiple-selection.sh

diff --git a/rsyslog/rsyslog.conf → overlay/etc/rsyslog.conf b/rsyslog/rsyslog.conf → overlay/etc/rsyslog.conf
diff --git a/apache.init → overlay/etc/sv/apache/run b/apache.init → overlay/etc/sv/apache/run
diff --git a/nagios.init → overlay/etc/sv/nagios/run b/nagios.init → overlay/etc/sv/nagios/run
diff --git a/postfix.init → overlay/etc/sv/postfix/run b/postfix.init → overlay/etc/sv/postfix/run
diff --git a/rsyslog.init → overlay/etc/sv/rsyslog/run b/rsyslog.init → overlay/etc/sv/rsyslog/run
diff --git a/nagios/cgi.cfg → overlay/opt/nagios/etc/cgi.cfg b/nagios/cgi.cfg → overlay/opt/nagios/etc/cgi.cfg
diff --git a/nagios/nagios.cfg → overlay/opt/nagios/etc/nagios.cfg b/nagios/nagios.cfg → overlay/opt/nagios/etc/nagios.cfg
diff --git a/nagios/commands.cfg → overlay/opt/nagios/etc/objects/commands.cfg b/nagios/commands.cfg → overlay/opt/nagios/etc/objects/commands.cfg
diff --git a/nagios/localhost.cfg → overlay/opt/nagios/etc/objects/localhost.cfg b/nagios/localhost.cfg → overlay/opt/nagios/etc/objects/localhost.cfg
diff --git a/nagios/templates.cfg → overlay/opt/nagios/etc/objects/templates.cfg b/nagios/templates.cfg → overlay/opt/nagios/etc/objects/templates.cfg
diff --git a/fix-nagiosgraph-multiple-selection.sh → ...etc/fix-nagiosgraph-multiple-selection.sh b/fix-nagiosgraph-multiple-selection.sh → ...etc/fix-nagiosgraph-multiple-selection.sh
diff --git a/start.sh → overlay/usr/local/bin/start_nagios b/start.sh → overlay/usr/local/bin/start_nagios