Cleanup dockerfiles

ONLYOFFICE · Apr 25, 2023 · d28d0fe · d28d0fe
1 parent 708684c
commit d28d0fe
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 37 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -11,12 +11,12 @@ ARG ONLYOFFICE_VALUE=onlyoffice
 
 SHELL ["/bin/sh", "-x", "-c"]
 
-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 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 \
@@ -51,22 +51,22 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
         supervisor \
         ttf-mscorefonts-installer \
         xvfb \
-        zlib1g && \
-    if [  $(ls -l /usr/share/fonts/truetype/msttcorefonts | wc -l) -ne 61 ]; \
-        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/*
+        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/*
 
 COPY config /app/ds/setup/config/
 COPY run-document-server.sh /app/ds/run-document-server.sh
@@ -85,17 +85,17 @@ 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 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
 

diff --git a/production.dockerfile b/production.dockerfile
@@ -1,4 +1,4 @@
-### Arguments avavlivable only for FROM instruction ### 
+### Arguments avavlivable only for FROM instruction ###
 ARG TAG=latest
 ARG COMPANY_NAME=onlyoffice
 ARG PRODUCT_EDITION=
@@ -8,7 +8,7 @@ ARG PRODUCT_EDITION=
 FROM ${COMPANY_NAME}/4testing-documentserver${PRODUCT_EDITION}:${TAG} as documentserver-stable
 
 ### Build nonexample ###
- 
+
 FROM ${COMPANY_NAME}/documentserver${PRODUCT_EDITION}:${TAG} as documentserver-nonexample
 
 ARG COMPANY_NAME=onlyoffice
@@ -19,6 +19,6 @@ ARG DS_SUPERVISOR_CONF=/etc/supervisor/conf.d/ds.conf
 
 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 $DS_SUPERVISOR_CONF \
     && rm -f /etc/nginx/includes/ds-example.conf \
-    && ln -s /etc/$COMPANY_NAME/$PRODUCT_NAME/supervisor/ds.conf  $DS_SUPERVISOR_CONF 
+    && ln -s /etc/$COMPANY_NAME/$PRODUCT_NAME/supervisor/ds.conf  $DS_SUPERVISOR_CONF