Move more dockerfiles to dedicated dirs

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Makefile

@@ -49,3 +49,4 @@ template-apply:
 	cat docker/Dockerfile.php.template | sed 's/php:8.1/php:7.4/' > docker/Dockerfile.php74
 	cat docker/Dockerfile.php.template | sed 's/php:8.1/php:8.0/' > docker/Dockerfile.php80
 	cat docker/Dockerfile.php.template | sed 's/php:8.1/php:8.1/' > docker/Dockerfile.php81
+	cat docker/Dockerfile.php.template | sed 's/php:8.1/php:8.2/' > docker/php82/Dockerfile

docker/Dockerfile.nginx

@@ -1,5 +0,0 @@
-FROM nginxproxy/nginx-proxy:latest
-RUN { \
-      echo 'server_tokens off;'; \
-      echo 'client_max_body_size 1024m;'; \
-    } > /etc/nginx/conf.d/my_proxy.conf

docker/Makefile

@@ -1,4 +0,0 @@
-.PHONY: Dockerfile.*
-Dockerfile.*:
-	NAME=$$(echo $@ | sed 's/^.*\.//'); echo "=> Building image $$NAME"; \
-	(docker build -t ghcr.io/juliushaertl/nextcloud-dev-$$NAME:latest -f Dockerfile.$$NAME .)

docker/ldap/Dockerfile

@@ -3,4 +3,4 @@ FROM osixia/openldap:latest
 ENV LDAP_DOMAIN="planetexpress.com"
 ENV LDAP_BASE_DN="dc=planetexpress,dc=com"
 
-COPY ./configs/ldap /container/service/slapd/assets/config/bootstrap/ldif/custom
+COPY ./ldap/seed /container/service/slapd/assets/config/bootstrap/ldif/custom

docker/lookupserver/Dockerfile

@@ -5,7 +5,7 @@ ENV DBPASSWD=abrakadabra
 
 ADD https://github.com/nextcloud/lookup-server/archive/master.zip /root/lookup-server.zip
 
-COPY configs/lookupserver/entrypoint.sh /usr/sbin/
+COPY lookupserver/entrypoint.sh /usr/sbin/
 
 RUN echo 'mariadb-server mysql-server/root_password password $DBPASSWD' | debconf-set-selections && \
     echo 'mariadb-server mysql-server/root_password_again password $DBPASSWD' | debconf-set-selections && \
@@ -30,8 +30,8 @@ RUN cd /root/ && \
     rm lookup-server.zip && \
     rm -Rf lookup-server-master
 
-COPY configs/lookupserver/config.php /var/www/html/config
-COPY configs/lookupserver/lookup.conf /etc/apache2/conf-available/
+COPY lookupserver/config.php /var/www/html/config
+COPY lookupserver/lookup.conf /etc/apache2/conf-available/
 
 RUN a2enmod rewrite && \
     a2enconf lookup && \

docker/nginx/Dockerfile

@@ -0,0 +1,9 @@
+FROM nginxproxy/nginx-proxy:latest
+RUN { \
+      echo 'server_tokens off;'; \
+      echo 'client_max_body_size 1024m;'; \
+      echo 'proxy_set_header Host $http_host;'; \
+      echo 'proxy_set_header X-Real-IP $remote_addr;'; \
+      echo 'proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;'; \
+      echo 'proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto;'; \
+    } > /etc/nginx/conf.d/my_proxy.conf