Move to v2 plugin structure

Dockerfile → phpldapadmin/Dockerfile

@@ -9,9 +9,8 @@ ENV VERSION "1"
 USER root
 
 #RUN apt-get install -y --no-install-recommends expect nano nmap ldap-utils # TODO: rauswerfen wenn fertig
-#RUN apt-get install -y --no-install-recommends phpldapadmin # package was removed from debian stretch before freeze due to delayed fixing 
+#RUN apt-get install -y --no-install-recommends phpldapadmin # package was removed from debian stretch before freeze due to delayed fixing
 RUN apt-get update && apt-get install -y --no-install-recommends wget apache2 php php-ldap php-xml
-#ucf
 
 #RUN wget http://ftp.de.debian.org/debian/pool/main/p/phpldapadmin/phpldapadmin_1.2.2-6.1_all.deb
 COPY phpldapadmin_1.2.2-6.1_all.deb /root/
@@ -21,6 +20,7 @@ RUN apt-get -f install /root/phpldapadmin_1.2.2-6.1_all.deb
 
 #COPY debconf_libpam /root/
 COPY entrypoint.sh /
+RUN chmod +x /entrypoint.sh
 
 EXPOSE 80
 

entrypoint.sh → phpldapadmin/entrypoint.sh

@@ -18,13 +18,10 @@ if [[ -z "$SLAPD_DOMAIN1" ]]; then
 fi
 
 # set the environment settings for slapd:
-sed -i "s|$servers->setValue('server','host','127.0.0.1');|$servers->setValue('server','host','$SLAPD_DOMAIN1.$SLAPD_DOMAIN0');|g" /etc/phpldapadmin/config.php
+sed -i "s|$servers->setValue('server','host','127.0.0.1');|$servers->setValue('server','host','ldap');|g" /etc/phpldapadmin/config.php
 sed -i "s|$servers->setValue('server','base',array('dc=example,dc=com'));|$servers->setValue('server','base',array('dc=$SLAPD_DOMAIN1,dc=$SLAPD_DOMAIN0'));|g" /etc/phpldapadmin/config.php
 sed -i "s|$servers->setValue('login','bind_id','cn=admin,dc=example,dc=com');|$servers->setValue('login','bind_id','cn=admin,dc=$SLAPD_DOMAIN1,dc=$SLAPD_DOMAIN0');|g" /etc/phpldapadmin/config.php
 sed -i "s|// $config->custom->appearance['hide_template_warning'] = false;|$config->custom->appearance['hide_template_warning'] = true;|g" /etc/phpldapadmin/config.php
 
-# check connection, TODO: raus werfen!
-#ldapsearch -x -h slapd -b "cn=admin,dc=$SLAPD_DOMAIN1,dc=$SLAPD_DOMAIN0"
-
 #chown -R openldap:openldap /var/lib/ldap/ /var/run/slapd/
 /usr/sbin/apache2ctl -D FOREGROUND

service.json

@@ -0,0 +1,45 @@
+{
+    "containers":[
+        {
+            "name":"phpldapadmin",
+            "hostname":"phpldapadmin",
+            "url":"https://jkm-marburg.de/pcsm/phpldapadmin/phpldapadmin.tar.gz",
+            "ports":[
+                {
+                    "external":89,
+                    "internal":80
+                }
+            ],
+            "networks":[
+                {
+                    "name":"schoolconnect"
+                },
+                {
+                    "name":"ldap-net"
+                }
+            ],
+            "volumes":[],
+            "environment":[
+                "SLAPD_PASSWORD",
+                "SLAPD_DOMAIN0",
+                "SLAPD_DOMAIN1"
+            ]
+        }
+    ],
+    "volumes":[],
+    "networks":[],
+    "environment":[
+        {
+            "name":"SLAPD_PASSWORD",
+            "description":""
+        },
+        {
+            "name":"SLAPD_DOMAIN0",
+            "description":""
+        },
+        {
+            "name":"SLAPD_DOMAIN1",
+            "description":""
+        }
+    ]
+}