Merge branch 'develop' into staging

* develop:
  switch to nginx base image

Dockerfile

@@ -1,14 +1,17 @@
-FROM kerstinsieren/alpine-phpfpm-nginx-baseimage:php74-apache-11
+FROM kerstinsieren/alpine-phpfpm-nginx-baseimage:php74-17
 ENV TZ=Europe/Berlin
 
 WORKDIR /var/www/html
-RUN usermod -a -G ssl-cert www-data
-RUN chown -R root:ssl-cert /etc/ssl \
-    && chmod -R 640 /etc/ssl/private \
-    && chmod 640 /etc/ssl/private/apache-selfsigned.key
+#RUN usermod -a -G ssl-cert www-data
+#RUN chown -R root:ssl-cert /etc/ssl \
+#    && chmod -R 640 /etc/ssl/private \
+#    && chmod 640 /etc/ssl/private/apache-selfsigned.key
 COPY . .
-RUN chown -R www-data:www-data /var/www
-USER www-data
+RUN chown -R nobody:nobody /var/www/html
+USER nobody
+
+#RUN chown -R www-data:www-data /var/www
+#USER www-data
 ONBUILD COPY composer.json ./
 RUN composer install --no-interaction
 

config/sites/abi2021/config.yaml

@@ -15,5 +15,3 @@ languages:
     websiteTitle: ''
 rootPageId: 6
 websiteTitle: 'abi» dein weg in studium und beruf'
-imports:
-  - { resource: "EXT:nnrestapi/Configuration/Yaml/default.yaml" }