Fixings for offical-images

- Fixed *.sh mode
- Removed label
- Fixed RUN settings
- Removed superfluous debMultiarch

2019.09-dev/apache/Dockerfile

@@ -1,6 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
 FROM php:7.3-apache-stretch
-LABEL maintainer="Philipp Holzer <admin@philipp.info>"
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -45,9 +44,6 @@ RUN set -ex; \
         curl \
         libzip-dev \
     ; \
-    \
-    debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
-    \
     docker-php-ext-configure gd \
         --with-gd \
         --with-freetype-dir=/usr/include/ \
@@ -98,7 +94,8 @@ RUN set -ex; \
     rm -rf /var/lib/apt/lists/*
 
 # set recommended PHP.ini settings
-RUN { \
+RUN set -ex; \
+    { \
         echo 'opcache.enable=1' ; \
         echo 'opcache.interned_strings_buffer=8'; \
         echo 'opcache.max_accelerated_files=10000'; \
@@ -121,7 +118,8 @@ RUN { \
 
 VOLUME /var/www/html
 
-RUN a2enmod rewrite remoteip ;\
+RUN set -ex;\
+    a2enmod rewrite remoteip ;\
     {\
      echo RemoteIPHeader X-Real-IP ;\
      echo RemoteIPTrustedProxy 10.0.0.0/8 ;\
@@ -136,7 +134,6 @@ ENV FRIENDICA_ADDONS 2019.09-dev
 
 COPY *.sh upgrade.exclude /
 COPY config/* /usr/src/friendica/config/
-RUN chmod +x /*.sh
 
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["apache2-foreground"]