diff --git a/Dockerfile b/Dockerfile index 1661f53..52525a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -FROM ubuntu:18.04 +FROM ubuntu:20.04 LABEL maintainer Ascensio System SIA -ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive +ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive PG_VERSION=12 ARG ONLYOFFICE_VALUE=onlyoffice @@ -16,13 +16,14 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \ apt-utils \ bomstrip \ certbot \ + curl \ + gconf-service \ htop \ libasound2 \ libboost-regex-dev \ libcairo2 \ - libcurl3 \ libcurl3-gnutls \ - libgconf2-4 \ + libcurl4 \ libgtk-3-0 \ libnspr4 \ libnss3 \ @@ -51,7 +52,7 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \ 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 10 main set listen_addresses 'localhost' && \ + pg_conftool $PG_VERSION main set listen_addresses 'localhost' && \ service postgresql restart && \ sudo -u postgres psql -c "CREATE DATABASE $ONLYOFFICE_VALUE;" && \ sudo -u postgres psql -c "CREATE USER $ONLYOFFICE_VALUE WITH password '$ONLYOFFICE_VALUE';" && \ diff --git a/run-document-server.sh b/run-document-server.sh index 1962b7a..626b72a 100755 --- a/run-document-server.sh +++ b/run-document-server.sh @@ -75,7 +75,6 @@ JSON_EXAMPLE="${JSON_BIN} -q -f ${ONLYOFFICE_EXAMPLE_CONFIG}" LOCAL_SERVICES=() PG_ROOT=/var/lib/postgresql -PG_VERSION=10 PG_NAME=main PGDATA=${PG_ROOT}/${PG_VERSION}/${PG_NAME} PG_NEW_CLUSTER=false diff --git a/tests/test.sh b/tests/test.sh index 6028584..535003a 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -36,7 +36,7 @@ fi # Run test environment docker-compose -p ds -f $config up -d -wakeup_timeout=30 +wakeup_timeout=90 # Get documentserver healthcheck status echo "Wait for service wake up"