From 7db1f72dd871b3308ed8f72f8244ae63a3c88c63 Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Wed, 16 Nov 2016 11:55:21 +0300 Subject: [PATCH 1/6] Use standart libstdc++ --- Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index e50e912..f66dc67 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,9 +13,6 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \ locale-gen en_US.UTF-8 && \ apt-get -y update && \ echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections && \ - apt-get install --force-yes -yq software-properties-common && \ - add-apt-repository ppa:ubuntu-toolchain-r/test && \ - apt-get -y update && \ apt-get --force-yes -yq install software-properties-common adduser postgresql redis-server rabbitmq-server nginx-extras nodejs libstdc++6 libcurl3 libxml2 libboost-regex-dev zlib1g supervisor fonts-dejavu fonts-liberation ttf-mscorefonts-installer fonts-crosextra-carlito fonts-takao-gothic fonts-opensymbol libxss1 libgtkglext1 libcairo2 xvfb libxtst6 libgconf2-4 libasound2 bomstrip libnspr4 libnss3 libnss3-nssdb nano htop && \ sudo -u postgres psql -c "CREATE DATABASE onlyoffice;" && \ sudo -u postgres psql -c "CREATE USER onlyoffice WITH password 'onlyoffice';" && \ From f0035e1e2713168d2f162aed76c9829c3bb23480 Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Fri, 18 Nov 2016 11:56:55 +0300 Subject: [PATCH 2/6] Removed spdy support --- config/nginx/onlyoffice-documentserver-ssl.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/nginx/onlyoffice-documentserver-ssl.conf b/config/nginx/onlyoffice-documentserver-ssl.conf index 78b6753..26501a9 100644 --- a/config/nginx/onlyoffice-documentserver-ssl.conf +++ b/config/nginx/onlyoffice-documentserver-ssl.conf @@ -25,8 +25,8 @@ server { ## HTTPS host server { - listen 0.0.0.0:443 ssl spdy; - listen [::]:443 ssl spdy default_server; + listen 0.0.0.0:443 ssl; + listen [::]:443 ssl default_server; server_tokens off; root /usr/share/nginx/html; From 4f55d140cb104c8b4ba20d6466467efbabaa40ce Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Wed, 23 Nov 2016 15:45:10 +0300 Subject: [PATCH 3/6] Update node.js version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f66dc67..14321b5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D9D0BF019CC8AC0D && \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1655A0AB68576280 && \ echo "deb http://archive.ubuntu.com/ubuntu precise main universe multiverse" >> /etc/apt/sources.list && \ - echo "deb https://deb.nodesource.com/node_4.x trusty main" | tee /etc/apt/sources.list.d/nodesource.list && \ + echo "deb https://deb.nodesource.com/setup_6.x trusty main" | tee /etc/apt/sources.list.d/nodesource.list && \ locale-gen en_US.UTF-8 && \ apt-get -y update && \ echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections && \ From 39ef3f4dae258b0db9d58b58c501587352abf8f7 Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Wed, 23 Nov 2016 16:18:57 +0300 Subject: [PATCH 4/6] Changed nodejs repo installation --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 14321b5..9f817bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,11 +5,11 @@ ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=nonint RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \ apt-get -y update && \ - apt-get --force-yes -yq install wget apt-transport-https && \ + apt-get --force-yes -yq install wget apt-transport-https curl && \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D9D0BF019CC8AC0D && \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1655A0AB68576280 && \ echo "deb http://archive.ubuntu.com/ubuntu precise main universe multiverse" >> /etc/apt/sources.list && \ - echo "deb https://deb.nodesource.com/setup_6.x trusty main" | tee /etc/apt/sources.list.d/nodesource.list && \ + curl -sL https://deb.nodesource.com/setup_6.x | bash - && \ locale-gen en_US.UTF-8 && \ apt-get -y update && \ echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections && \ From 47b0ab27bcfa69775782e7ab93b8dade09ae555d Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Wed, 23 Nov 2016 17:04:52 +0300 Subject: [PATCH 5/6] Removed node.js key --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9f817bd..01edf36 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,6 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \ apt-get -y update && \ apt-get --force-yes -yq install wget apt-transport-https curl && \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D9D0BF019CC8AC0D && \ - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1655A0AB68576280 && \ echo "deb http://archive.ubuntu.com/ubuntu precise main universe multiverse" >> /etc/apt/sources.list && \ curl -sL https://deb.nodesource.com/setup_6.x | bash - && \ locale-gen en_US.UTF-8 && \ From 8b812ac491c65906173f6f5be510dbfc4cd95ea5 Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Wed, 23 Nov 2016 17:16:59 +0300 Subject: [PATCH 6/6] fixed warning: setlocale: LC_ALL: cannot change... --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 01edf36..c9bc7fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,8 +8,8 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \ apt-get --force-yes -yq install wget apt-transport-https curl && \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D9D0BF019CC8AC0D && \ echo "deb http://archive.ubuntu.com/ubuntu precise main universe multiverse" >> /etc/apt/sources.list && \ - curl -sL https://deb.nodesource.com/setup_6.x | bash - && \ locale-gen en_US.UTF-8 && \ + curl -sL https://deb.nodesource.com/setup_6.x | bash - && \ apt-get -y update && \ echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections && \ apt-get --force-yes -yq install software-properties-common adduser postgresql redis-server rabbitmq-server nginx-extras nodejs libstdc++6 libcurl3 libxml2 libboost-regex-dev zlib1g supervisor fonts-dejavu fonts-liberation ttf-mscorefonts-installer fonts-crosextra-carlito fonts-takao-gothic fonts-opensymbol libxss1 libgtkglext1 libcairo2 xvfb libxtst6 libgconf2-4 libasound2 bomstrip libnspr4 libnss3 libnss3-nssdb nano htop && \