Cleanup dockerfiles 2

Dockerfile

@@ -5,16 +5,27 @@ LABEL maintainer Ascensio System SIA <[email protected]>
 
 ARG PG_VERSION=14
 
-ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive PG_VERSION=${PG_VERSION}
+ENV LANG=en_US.UTF-8 \
+    LANGUAGE=en_US:en \
+    LC_ALL=en_US.UTF-8 \
+    DEBIAN_FRONTEND=noninteractive \
+    PG_VERSION=${PG_VERSION}
 
 ARG ONLYOFFICE_VALUE=onlyoffice
 
-RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d \
-    && apt-get -y update \
-    && apt-get -yq install wget apt-transport-https gnupg locales lsb-release \
-    && locale-gen en_US.UTF-8 \
-    && echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections \
-    && apt-get -yq install \
+RUN set -eux; \
+    echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d; \
+    apt-get -y update; \
+    apt-get -yq install \
+        wget \
+        apt-transport-https \
+        gnupg \
+        locales \
+        lsb-release \
+    ; \
+    locale-gen en_US.UTF-8; \
+    echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections; \
+    apt-get -yq install \
         adduser \
         apt-utils \
         bomstrip \
@@ -50,21 +61,24 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d \
         ttf-mscorefonts-installer \
         xvfb \
         zlib1g \
-    && [ $(ls -1 /usr/share/fonts/truetype/msttcorefonts | wc -l) -eq 60 ] \
-    || (echo 'msttcorefonts failed to download'; exit 1) \
-    && echo "SERVER_ADDITIONAL_ERL_ARGS=\"+S 1:1\"" | tee -a /etc/rabbitmq/rabbitmq-env.conf \
-    && sed -i "s/bind .*/bind 127.0.0.1/g" /etc/redis/redis.conf \
-    && sed 's|\(application\/zip.*\)|\1\n    application\/wasm wasm;|' -i /etc/nginx/mime.types \
-    && pg_conftool $PG_VERSION main set listen_addresses 'localhost' \
-    && service postgresql restart \
-    && sudo -u postgres psql -c "CREATE USER $ONLYOFFICE_VALUE WITH password '$ONLYOFFICE_VALUE';" \
-    && sudo -u postgres psql -c "CREATE DATABASE $ONLYOFFICE_VALUE OWNER $ONLYOFFICE_VALUE;" \
-    && service postgresql stop \
-    && service redis-server stop \
-    && service rabbitmq-server stop \
-    && service supervisor stop \
-    && service nginx stop \
-    && rm -rf /var/lib/apt/lists/*
+    ; \
+    if [ $(ls -1 /usr/share/fonts/truetype/msttcorefonts | wc -l) -eq 60 ]; then \
+        echo 'msttcorefonts failed to download'; \
+        exit 1; \
+    fi; \
+    echo "SERVER_ADDITIONAL_ERL_ARGS=\"+S 1:1\"" | tee -a /etc/rabbitmq/rabbitmq-env.conf; \
+    sed -i "s/bind .*/bind 127.0.0.1/g" /etc/redis/redis.conf; \
+    sed 's|\(application\/zip.*\)|\1\n    application\/wasm wasm;|' -i /etc/nginx/mime.types; \
+    pg_conftool $PG_VERSION main set listen_addresses 'localhost'; \
+    service postgresql restart; \
+    sudo -u postgres psql -c "CREATE USER $ONLYOFFICE_VALUE WITH password '$ONLYOFFICE_VALUE';"; \
+    sudo -u postgres psql -c "CREATE DATABASE $ONLYOFFICE_VALUE OWNER $ONLYOFFICE_VALUE;"; \
+    service postgresql stop; \
+    service redis-server stop; \
+    service rabbitmq-server stop; \
+    service supervisor stop; \
+    service nginx stop; \
+    rm -rf /var/lib/apt/lists/*
 
 COPY config /app/ds/setup/config/
 COPY run-document-server.sh /app/ds/run-document-server.sh
@@ -83,18 +97,25 @@ ENV COMPANY_NAME=$COMPANY_NAME \
     PRODUCT_EDITION=$PRODUCT_EDITION \
     DS_DOCKER_INSTALLATION=true
 
-RUN PACKAGE_FILE="${COMPANY_NAME}-${PRODUCT_NAME}${PRODUCT_EDITION}${PACKAGE_VERSION:+_$PACKAGE_VERSION}_${TARGETARCH:-$(dpkg --print-architecture)}.deb" \
-    && wget -q -P /tmp "$PACKAGE_BASEURL/$PACKAGE_FILE" \
-    && apt-get -y update \
-    && service postgresql start \
-    && apt-get -yq install /tmp/$PACKAGE_FILE \
-    && service postgresql stop \
-    && service supervisor stop \
-    && chmod 755 /app/ds/*.sh \
-    && rm -f /tmp/$PACKAGE_FILE \
-    && rm -rf /var/log/$COMPANY_NAME \
-    && rm -rf /var/lib/apt/lists/*
+RUN set -eux; \
+    PACKAGE_FILE="${COMPANY_NAME}-${PRODUCT_NAME}${PRODUCT_EDITION}${PACKAGE_VERSION:+_$PACKAGE_VERSION}_${TARGETARCH:-$(dpkg --print-architecture)}.deb"; \
+    wget -q -P /tmp "$PACKAGE_BASEURL/$PACKAGE_FILE"; \
+    apt-get -y update; \
+    service postgresql start; \
+    apt-get -yq install /tmp/$PACKAGE_FILE; \
+    service postgresql stop; \
+    service supervisor stop; \
+    chmod 755 /app/ds/*.sh; \
+    rm -f /tmp/$PACKAGE_FILE; \
+    rm -rf /var/log/$COMPANY_NAME; \
+    rm -rf /var/lib/apt/lists/*
 
-VOLUME /var/log/$COMPANY_NAME /var/lib/$COMPANY_NAME /var/www/$COMPANY_NAME/Data /var/lib/postgresql /var/lib/rabbitmq /var/lib/redis /usr/share/fonts/truetype/custom
+VOLUME /var/log/$COMPANY_NAME \
+    /var/lib/$COMPANY_NAME \
+    /var/www/$COMPANY_NAME/Data \
+    /var/lib/postgresql \
+    /var/lib/rabbitmq \
+    /var/lib/redis \
+    /usr/share/fonts/truetype/custom
 
 ENTRYPOINT ["/app/ds/run-document-server.sh"]

production.dockerfile

@@ -17,8 +17,9 @@ ARG DS_SUPERVISOR_CONF=/etc/supervisor/conf.d/ds.conf
 
 ### Remove all documentserver-example data ###
 
-RUN    rm -rf /var/www/$COMPANY_NAME/$PRODUCT_NAME-example \
-    && rm -rf /etc/$COMPANY_NAME/$PRODUCT_NAME-example \
-    && rm -f $DS_SUPERVISOR_CONF \
-    && rm -f /etc/nginx/includes/ds-example.conf \
-    && ln -s /etc/$COMPANY_NAME/$PRODUCT_NAME/supervisor/ds.conf $DS_SUPERVISOR_CONF
+RUN set -eux; \
+    rm -rf /var/www/$COMPANY_NAME/$PRODUCT_NAME-example; \
+    rm -rf /etc/$COMPANY_NAME/$PRODUCT_NAME-example; \
+    rm -f $DS_SUPERVISOR_CONF; \
+    rm -f /etc/nginx/includes/ds-example.conf; \
+    ln -s /etc/$COMPANY_NAME/$PRODUCT_NAME/supervisor/ds.conf $DS_SUPERVISOR_CONF