install modules, director and make fixes in one layer

jjethwa · Jan 6, 2017 · ee4e300 · ee4e300
1 parent 5f89f82
commit ee4e300
Show file tree

Hide file tree

Showing 15 changed files with 9 additions and 11 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -50,7 +50,15 @@ RUN wget --quiet -O - https://packages.icinga.org/icinga.key \
 
 ADD content/ /
 
-RUN    mv /etc/icingaweb2/ /etc/icingaweb2.dist \
+# Temporary hack to get icingaweb2 modules via git
+RUN wget -q --no-cookies -O - "https://github.com/Icinga/icingaweb2/archive/${GITREF_ICINGAWEB2}.tar.gz" \
+    | tar xz --strip-components=2 --directory=/etc/icingaweb2/modules -f - icingaweb2-${GITREF_ICINGAWEB2}/modules/monitoring icingaweb2-${GITREF_ICINGAWEB2}/modules/doc \
+# Icinga Director
+    && wget -q --no-cookies -O - "https://github.com/Icinga/icingaweb2-module-director/archive/${GITREF_DIRECTOR}.tar.gz" \
+    | tar xz --strip-components=1 --directory=/etc/icingaweb2/modules/director --exclude=.gitignore -f - \
+    && icingacli module enable director \
+# Final fixes
+    && mv /etc/icingaweb2/ /etc/icingaweb2.dist \
     && mkdir /etc/icingaweb2 \
     && mv /etc/icinga2/ /etc/icinga2.dist \
     && mkdir /etc/icinga2 \
@@ -61,14 +69,6 @@ RUN    mv /etc/icingaweb2/ /etc/icingaweb2.dist \
         /bin/ping6 \
         /usr/lib/nagios/plugins/check_icmp
 
-# Temporary hack to get icingaweb2 modules via git
-RUN wget -q --no-cookies -O - "https://github.com/Icinga/icingaweb2/archive/${GITREF_ICINGAWEB2}.tar.gz" \
-  | tar xz --strip-components=2 --directory=/etc/icingaweb2.dist/modules -f - icingaweb2-${GITREF_ICINGAWEB2}/modules/monitoring icingaweb2-${GITREF_ICINGAWEB2}/modules/doc
-
-# Icinga Director
-RUN wget -q --no-cookies -O - "https://github.com/Icinga/icingaweb2-module-director/archive/${GITREF_DIRECTOR}.tar.gz" \
-  | tar xz --strip-components=1 --directory=/etc/icingaweb2.dist/modules/director --exclude=.gitignore -f -
-
 EXPOSE 80 443 5665
 
 # Initialize and run Supervisor

diff --git a/content/etc/icingaweb2.dist/CONFIGURED → content/etc/icingaweb2/CONFIGURED b/content/etc/icingaweb2.dist/CONFIGURED → content/etc/icingaweb2/CONFIGURED
diff --git a/...nt/etc/icingaweb2.dist/authentication.ini → content/etc/icingaweb2/authentication.ini b/...nt/etc/icingaweb2.dist/authentication.ini → content/etc/icingaweb2/authentication.ini
diff --git a/content/etc/icingaweb2.dist/config.ini → content/etc/icingaweb2/config.ini b/content/etc/icingaweb2.dist/config.ini → content/etc/icingaweb2/config.ini
diff --git a/...c/icingaweb2.dist/enabledModules/.gitkeep → ...nt/etc/icingaweb2/enabledModules/.gitkeep b/...c/icingaweb2.dist/enabledModules/.gitkeep → ...nt/etc/icingaweb2/enabledModules/.gitkeep
diff --git a/content/etc/icingaweb2.dist/groups.ini → content/etc/icingaweb2/groups.ini b/content/etc/icingaweb2.dist/groups.ini → content/etc/icingaweb2/groups.ini
diff --git a/...ingaweb2.dist/modules/director/config.ini → ...tc/icingaweb2/modules/director/config.ini b/...ingaweb2.dist/modules/director/config.ini → ...tc/icingaweb2/modules/director/config.ini
diff --git a/...gaweb2.dist/modules/director/director.api → .../icingaweb2/modules/director/director.api b/...gaweb2.dist/modules/director/director.api → .../icingaweb2/modules/director/director.api
diff --git a/...aweb2.dist/modules/director/kickstart.ini → ...icingaweb2/modules/director/kickstart.ini b/...aweb2.dist/modules/director/kickstart.ini → ...icingaweb2/modules/director/kickstart.ini
diff --git a/...web2.dist/modules/monitoring/backends.ini → ...cingaweb2/modules/monitoring/backends.ini b/...web2.dist/modules/monitoring/backends.ini → ...cingaweb2/modules/monitoring/backends.ini
diff --git a/.../modules/monitoring/commandtransports.ini → .../modules/monitoring/commandtransports.ini b/.../modules/monitoring/commandtransports.ini → .../modules/monitoring/commandtransports.ini
diff --git a/...gaweb2.dist/modules/monitoring/config.ini → .../icingaweb2/modules/monitoring/config.ini b/...gaweb2.dist/modules/monitoring/config.ini → .../icingaweb2/modules/monitoring/config.ini
diff --git a/content/etc/icingaweb2.dist/resources.ini → content/etc/icingaweb2/resources.ini b/content/etc/icingaweb2.dist/resources.ini → content/etc/icingaweb2/resources.ini
diff --git a/content/etc/icingaweb2.dist/roles.ini → content/etc/icingaweb2/roles.ini b/content/etc/icingaweb2.dist/roles.ini → content/etc/icingaweb2/roles.ini
diff --git a/content/opt/setup/icingaweb2-director b/content/opt/setup/icingaweb2-director
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-icingacli module enable director
-
 # director
 mysql <<-END
   CREATE DATABASE IF NOT EXISTS director CHARACTER SET 'utf8';