Merge pull request #45 from Icinga/feature/ipl-42

Install icinga-php-*

Dockerfile

@@ -3,6 +3,8 @@
 FROM icinga/icingaweb2-deps
 
 COPY icingaweb2 /usr/share/icingaweb2
+COPY icinga-php /usr/share/icinga-php
+
 RUN ["ln", "-vs", "/usr/share/icingaweb2/packages/files/apache/icingaweb2.conf", "/etc/apache2/conf-enabled/"]
 RUN ["ln", "-vs", "/usr/share/icingaweb2/bin/icingacli", "/usr/local/bin/"]
 

composer.bash

@@ -2,7 +2,7 @@
 # Icinga Web 2 Docker image | (c) 2020 Icinga GmbH | GPLv2+
 set -exo pipefail
 
-for d in icingaweb2 icingaweb2/modules/*; do
+for d in icingaweb2 icinga-php/* icingaweb2/modules/*; do
 	pushd "$d"
 
 	if [ -e composer.json ]; then

get-mods.sh

@@ -9,15 +9,15 @@ get_tag () {
 }
 
 get_special () {
-	if [ ! -e "icingaweb2/modules/$2" ]; then
+	if [ ! -e "$2" ]; then
 		rm -rf dockerweb2-temp
 		git clone --bare "https://github.com/Icinga/${1}.git" dockerweb2-temp
 
 		case "$2" in
-			icingadb)
+			icingaweb2/modules/icingadb)
 				REF=2c0662c420617712bd26234da550dcf8d4afcdb8 # v1.0.0-rc1+
 				;;
-			incubator|ipl|reactbundle)
+			icingaweb2/modules/incubator)
 				REF="$(get_tag)"
 				;;
 			*)
@@ -29,15 +29,25 @@ get_special () {
 				;;
 		esac
 
-		git -C dockerweb2-temp archive "--prefix=icingaweb2/modules/${2}/" "$REF" |tar -x
+		git -C dockerweb2-temp archive "--prefix=${2}/" "$REF" |tar -x
 		rm -rf dockerweb2-temp
 	fi
 }
 
-get_mod () {
+get_lib () {
-	get_special "icingaweb2-module-$1" "$1"
+	get_special "icinga-php-$1" "icinga-php/$2"
 }
 
+get_altname () {
+	get_special "$1" "icingaweb2/modules/$2"
+}
+
+get_mod () {
+	get_altname "icingaweb2-module-$1" "$1"
+}
+
+get_lib library ipl
+get_lib thirdparty vendor
 get_mod audit
 get_mod aws
 get_mod businessprocess
@@ -45,12 +55,10 @@ get_mod cube
 get_mod director
 get_mod fileshipper
 get_mod graphite
-get_special icingadb-web icingadb
+get_altname icingadb-web icingadb
 get_mod idoreports
 get_mod incubator
-get_mod ipl
 get_mod pdfexport
-get_mod reactbundle
 get_mod reporting
 get_mod vspheredb
 get_mod x509