Compare commits

...

6 Commits

Author SHA1 Message Date
8651c95e1b Remove whitespaces from variables
Did not realize that docker doesn't ignore spaces before and after `=`
2022-03-13 02:17:01 +01:00
195decf0c7 Fixes for file sizes settings 2022-03-13 01:47:40 +01:00
b3c9d5a707 Copy the script to the image 2022-03-12 17:25:24 +01:00
4209059223 Add option to enlarge the file limits 2022-03-12 17:23:04 +01:00
ae61eae818
Merge pull request #4 from jiriks74/master
Update README.md
2022-03-12 15:40:40 +01:00
237cd83cb3
Merge pull request #3 from jiriks74/master
Update working branch
2022-03-10 00:07:29 +01:00
4 changed files with 60 additions and 27 deletions

@ -4,7 +4,7 @@ LABEL maintainer="jiriks74"
RUN echo "deb http://deb.debian.org/debian bullseye main contrib non-free\ndeb http://deb.debian.org/debian-security/ bullseye-security main contrib non-free\ndeb http://deb.debian.org/debian bullseye-updates main contrib non-free\ndeb http://deb.debian.org/debian bullseye-backports main" > /etc/apt/sources.list
RUN mkdir /build
RUN cd /build
WORKDIR /build
ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive PG_VERSION=13
@ -73,38 +73,49 @@ RUN apt install qemu binfmt-support qemu-user-static -t bullseye-backports -y
RUN dpkg --add-architecture amd64
RUN apt update && apt install libgcc-s1 libgcc-s1:amd64 -y
RUN cd /build && apt download libc6:amd64
RUN dpkg-deb -R /build/libc6*.deb /build/libc6
RUN apt download libc6:amd64
RUN dpkg-deb -R ./libc6*.deb ./libc6
RUN sed -i 's/^Package: libc6$/Package: libc6-amd64/' /build/libc6/DEBIAN/control
RUN sed -i 's/^Depends: libgcc-s1, libcrypt1$/#Depends: libgcc-s1, libcrypt1/' /build/libc6/DEBIAN/control
RUN sed -i 's/^Package: libc6$/Package: libc6-amd64/' ./libc6/DEBIAN/control
RUN sed -i 's/^Depends: libgcc-s1, libcrypt1$/#Depends: libgcc-s1, libcrypt1/' ./libc6/DEBIAN/control
RUN rm -rf /build/libc6/usr/share/doc
RUN rm -rf /build/libc6/usr/share/lintian
RUN rm -rf ./libc6/usr/share/doc
RUN rm -rf ./libc6/usr/share/lintian
RUN dpkg-deb -b /build/libc6 /build/libc6-modified.deb
RUN dpkg -i /build/libc6-modified.deb
RUN dpkg-deb -b ./libc6 ./libc6-modified.deb
RUN dpkg -i ./libc6-modified.deb
RUN cd /build && apt download libstdc++6:amd64
RUN dpkg-deb -R /build/libstdc++6*.deb /build/stdc
RUN apt download libstdc++6:amd64
RUN dpkg-deb -R ./libstdc++6*.deb ./stdc
RUN sed -i 's/^Depends: gcc-10-base (= 10.2.1-6), libc6 (>= 2.23), libgcc-s1 (>= 4.2)$/#Depends: gcc-10-base (= 10.2.1-6), libc6 (>= 2.23), libgcc-s1 (>= 4.2)/' /build/stdc/DEBIAN/control
RUN sed -i 's/^Depends: gcc-10-base (= 10.2.1-6), libc6 (>= 2.23), libgcc-s1 (>= 4.2)$/#Depends: gcc-10-base (= 10.2.1-6), libc6 (>= 2.23), libgcc-s1 (>= 4.2)/' ./stdc/DEBIAN/control
RUN dpkg-deb -b /build/stdc /build/libstdc++6-modified.deb
RUN dpkg -i /build/libstdc++6-modified.deb
RUN dpkg-deb -b ./stdc ./libstdc++6-modified.deb
RUN dpkg -i ./libstdc++6-modified.deb
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CB2DE8E5
RUN echo "deb https://download.onlyoffice.com/repo/debian squeeze main" | tee /etc/apt/sources.list.d/onlyoffice.list
RUN cd /build && apt update && apt download onlyoffice-documentserver:amd64
RUN dpkg-deb -R /build/onlyoffice-documentserver*.deb /build/onlyoffice
RUN apt update && apt download onlyoffice-documentserver:amd64
RUN dpkg-deb -R ./onlyoffice-documentserver*.deb ./onlyoffice
RUN sed -i 's/^Depends: debconf (>= 0.5) | debconf-2.0, adduser, ca-certificates, coreutils, curl, libasound2, libcairo2, libcurl3 | libcurl4, libcurl3-gnutls, libgconf-2-4, libgtk-3-0, libstdc++6 (>= 4.8.4), libxml2, libxss1, libxtst6, logrotate, mysql-client | mariadb-client, nginx-extras (>= 1.3.13), postgresql-client (>= 9.1), pwgen, supervisor (>= 3.0b2), xvfb, zlib1g$/Depends: debconf:arm64 (>= 0.5) | debconf-2.0:arm64, adduser:arm64, ca-certificates:arm64, coreutils:arm64, curl:arm64, libasound2:arm64, libcairo2:arm64, libcurl3:arm64 | libcurl4:arm64, libcurl3-gnutls:arm64, libgconf-2-4:arm64, libgtk-3-0:arm64, libstdc++6:amd64 (>= 4.8.4), libxml2:arm64, libxss1:arm64, libxtst6:arm64, logrotate:arm64, mysql-client:arm64 | mariadb-client:arm64, nginx-extras:arm64 (>= 1.3.13), postgresql-client:arm64 (>= 9.1), pwgen:arm64, supervisor:all (>= 3.0b2), xvfb:arm64, zlib1g:arm64/' /build/onlyoffice/DEBIAN/control
RUN sed -i 's/^Depends: debconf (>= 0.5) | debconf-2.0, adduser, ca-certificates, coreutils, curl, libasound2, libcairo2, libcurl3 | libcurl4, libcurl3-gnutls, libgconf-2-4, libgtk-3-0, libstdc++6 (>= 4.8.4), libxml2, libxss1, libxtst6, logrotate, mysql-client | mariadb-client, nginx-extras (>= 1.3.13), postgresql-client (>= 9.1), pwgen, supervisor (>= 3.0b2), xvfb, zlib1g$/Depends: debconf:arm64 (>= 0.5) | debconf-2.0:arm64, adduser:arm64, ca-certificates:arm64, coreutils:arm64, curl:arm64, libasound2:arm64, libcairo2:arm64, libcurl3:arm64 | libcurl4:arm64, libcurl3-gnutls:arm64, libgconf-2-4:arm64, libgtk-3-0:arm64, libstdc++6:amd64 (>= 4.8.4), libxml2:arm64, libxss1:arm64, libxtst6:arm64, logrotate:arm64, mysql-client:arm64 | mariadb-client:arm64, nginx-extras:arm64 (>= 1.3.13), postgresql-client:arm64 (>= 9.1), pwgen:arm64, supervisor:all (>= 3.0b2), xvfb:arm64, zlib1g:arm64/' ./onlyoffice/DEBIAN/control
RUN dpkg-deb -b /build/onlyoffice /build/onlyoffice-documentserver-modified.deb
RUN dpkg-deb -b ./onlyoffice ./onlyoffice-documentserver-modified.deb
RUN service postgresql start && \
apt-get -yq install ./onlyoffice-documentserver-modified.deb && \
service postgresql stop && \
service supervisor stop && \
rm -rf /build/ && \
rm -rf /var/log/$COMPANY_NAME && \
rm -rf /var/lib/apt/lists/*
COPY config /app/ds/setup/config/
COPY run-document-server.sh /app/ds/run-document-server.sh
COPY largeFiles.sh /app/ds/largeFiles.sh
RUN chmod 755 /app/ds/*.sh
EXPOSE 80 443
@ -115,15 +126,6 @@ ARG PACKAGE_URL="http://download.onlyoffice.com/install/documentserver/linux/${C
ENV COMPANY_NAME=$COMPANY_NAME \
PRODUCT_NAME=$PRODUCT_NAME
RUN service postgresql start && \
apt-get -yq install /build/onlyoffice-documentserver-modified.deb && \
service postgresql stop && \
service supervisor stop && \
chmod 755 /app/ds/*.sh && \
rm -rf /build/ && \
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
ENTRYPOINT ["/app/ds/run-document-server.sh"]

@ -19,6 +19,11 @@ services:
#- JWT_SECRET=secret
#- JWT_HEADER=AuthorizationJwt
#- JWT_IN_BODY=true
# Uncomment strings below to enable larger files
#- LARGER_FILES=true
#- MAX_DOWNLOAD_SIZE=104857600 # Download size in bytes
#- MAX_UNCOMPRESSED_SIZE=300 # Uncompressed of a file in MB
ports:
- '80:80'
- '443:443'

22
largeFiles.sh Executable file

@ -0,0 +1,22 @@
#!/usr/bin/env bash
LARGER_FILES=${LARGER_FILES:-false}
MAX_DOWNOAD_SIZE=${MAX_DOWNLOAD_SIZE:-104857600}
MAX_UNCOMPRESSED_SIZE=${MAX_UNCOMPRESSED_SIZE:-300}
if [ "$LARGER_FILES" = true ]; then
sed -i -e "s/104857600/${MAX_DOWNLOAD_SIZE}/g" /etc/onlyoffice/documentserver-example/production-linux.json
sed -i "9iclient_max_body_size ${MAX_DOWNLOAD_SIZE};" /etc/onlyoffice/documentserver-example/nginx/includes/ds-example.conf
sed -i "16iclient_max_body_size ${MAX_DOWLOAD_SIZE};" /etc/nginx/nginx.conf
sed -i -e "s/104857600/${MAX_DOWNLOAD_SIZE}/g" /etc/onlyoffice/documentserver/default.json
sed -i -e "s/50MB/${MAX_UNCOMPRESSED_SIZE}MB/g" /etc/onlyoffice/documentserver/default.json
sed -i -e "s/300MB/${MAX_UNCOMPRESSED_SIZE}MB/g" /etc/onlyoffice/documentserver/default.json
sed -i "s/^client_max_body_size 100m;$/client_max_body_size ${MAX_DOWNLOAD_SIZE};/" /etc/onlyoffice/documentserver/nginx/includes/ds-common.conf
fi
touch /app/ds/largeFiles.lck
#service nginx restart
#supervisorctl restart all

@ -1,5 +1,9 @@
#!/bin/bash
if [[ ! -e /app/ds/largeFiles.lck ]]; then
/app/ds/largeFiles.sh
fi
function clean_exit {
/usr/bin/documentserver-prepare4shutdown.sh
}