Merge branch 'master' into feature/files

2020-06-23 18:21:31 +00:00 · 2020-06-23 18:21:31 +00:00 · 5ff7ddd875
commit 5ff7ddd875
parent dacde04f39 453c812476
3 changed files with 262129 additions and 32 deletions
--- a/build/install/docker/Dockerfile
+++ b/build/install/docker/Dockerfile
@ -15,6 +15,8 @@ ENV LANG=en_US.UTF-8 \
    LC_ALL=en_US.UTF-8

 RUN apt-get -y update && \
+    apt-get -y upgrade && \
+    apt-get -y dist-upgrade && \
    apt-get -yq install gnupg2 ca-certificates && \
    apt-get install -yq sudo locales && \
    addgroup --system --gid 107 onlyoffice && \
@ -24,6 +26,12 @@ RUN apt-get -y update && \
    locale-gen en_US.UTF-8 && \
    apt-get -y update && \
    apt-get install -yq software-properties-common wget curl cron rsyslog && \
+    curl -OL http://dev.mysql.com/get/mysql-apt-config_0.8.15-1_all.deb && \
+    echo "mysql-apt-config mysql-apt-config/repo-codename select bionic" | sudo debconf-set-selections && \
+    echo "mysql-apt-config mysql-apt-config/repo-distro select ubuntu" | sudo debconf-set-selections && \
+    echo "mysql-apt-config mysql-apt-config/select-server select mysql-8.0" | sudo debconf-set-selections && \
+    DEBIAN_FRONTEND=noninteractive dpkg -i mysql-apt-config_0.8.15-1_all.deb && \
+    rm -f mysql-apt-config_0.8.15-1_all.deb && \
    wget http://nginx.org/keys/nginx_signing.key && \
    apt-key add nginx_signing.key && \
    echo "deb http://nginx.org/packages/mainline/ubuntu/ bionic nginx" >> /etc/apt/sources.list.d/nginx.list && \
@ -33,9 +41,9 @@ RUN apt-get -y update && \
    apt-get install -yq apt-transport-https && \
    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \
    echo "deb https://download.mono-project.com/repo/ubuntu stable-bionic main" | tee /etc/apt/sources.list.d/mono-official.list && \
-    echo "deb https://artifacts.elastic.co/packages/6.x/apt stable main" | tee -a /etc/apt/sources.list.d/elastic-6.x.list && \
+    echo "deb https://artifacts.elastic.co/packages/7.x/apt stable main" | tee -a /etc/apt/sources.list.d/elastic-7.x.list && \
    apt-get -y update && \
-    apt-get install -yq elasticsearch=6.5.0 && \
+    apt-get install -yq elasticsearch=7.4.0 && \
    add-apt-repository -y ppa:certbot/certbot && \
    curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash - && \
    apt-get install -y nodejs && \
@ -46,9 +54,9 @@ RUN apt-get -y update && \
    apt-get -y update && \
    apt-get install -yq nginx && \
    cd ~ && \
-    wget http://www-us.apache.org/dist/kafka/2.2.1/kafka_2.12-2.2.1.tgz && \
-    tar xzf kafka_2.12-2.2.1.tgz && \
-    rm kafka_2.12-2.2.1.tgz && \
+    wget https://downloads.apache.org/kafka/2.5.0/kafka_2.12-2.5.0.tgz && \
+    tar xzf kafka_2.12-2.5.0.tgz && \
+    rm kafka_2.12-2.5.0.tgz && \
    echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
    apt-get install -yq libgdiplus \
                        python-certbot-nginx \
@ -71,15 +79,13 @@ RUN git clone https://github.com/ONLYOFFICE/AppServer.git /app/onlyoffice/src/

 RUN cd /app/onlyoffice/src/ && \
    yarn install --cwd web/ASC.Web.Components --frozen-lockfile > build/ASC.Web.Components.log && \
-    npm run build --prefix web/ASC.Web.Components && \
    yarn pack --cwd web/ASC.Web.Components
 	
 RUN cd /app/onlyoffice/src/ && \
    component=$(ls web/ASC.Web.Components/asc-web-components-v1.*.tgz) && \
-	yarn remove asc-web-components --cwd web/ASC.Web.Common --peer && \
+    yarn remove asc-web-components --cwd web/ASC.Web.Common --peer && \
    yarn add file:../../$component --cwd web/ASC.Web.Common --cache-folder ../../yarn --peer && \
    yarn install --cwd web/ASC.Web.Common --frozen-lockfile > build/ASC.Web.Common.log && \
-    npm run build --prefix web/ASC.Web.Common && \
    yarn pack --cwd web/ASC.Web.Common

 RUN cd /app/onlyoffice/src/ && \
@ -89,10 +95,10 @@ RUN cd /app/onlyoffice/src/ && \

 RUN cd /app/onlyoffice/src/ && \
    component=$(ls web/ASC.Web.Components/asc-web-components-v1.*.tgz) && \
-	common=$(ls web/ASC.Web.Common/asc-web-common-v1.*.tgz) && \
-	yarn remove asc-web-components asc-web-common --cwd web/ASC.Web.Client && \
+    common=$(ls web/ASC.Web.Common/asc-web-common-v1.*.tgz) && \
+    yarn remove asc-web-components asc-web-common --cwd web/ASC.Web.Client && \
    yarn add ../../$component --cwd web/ASC.Web.Client --cache-folder ../../yarn && \
-	yarn add ../../$common --cwd web/ASC.Web.Client --cache-folder ../../yarn && \
+    yarn add ../../$common --cwd web/ASC.Web.Client --cache-folder ../../yarn && \
    yarn install --cwd web/ASC.Web.Client --frozen-lockfile || (cd web/ASC.Web.Client && npm i && cd ../../) && \
    npm run build --prefix web/ASC.Web.Client && \
    rm -rf /var/www/studio/client/* && \
@ -101,10 +107,22 @@ RUN cd /app/onlyoffice/src/ && \

 RUN cd /app/onlyoffice/src/ && \
    component=$(ls  web/ASC.Web.Components/asc-web-components-v1.*.tgz) && \
-	common=$(ls web/ASC.Web.Common/asc-web-common-v1.*.tgz) && \
-	yarn remove asc-web-components asc-web-common --cwd products/ASC.People/Client && \
+    common=$(ls web/ASC.Web.Common/asc-web-common-v1.*.tgz) && \
+    yarn remove asc-web-components asc-web-common --cwd products/ASC.Files/Client && \
+    yarn add ../../../$component --cwd products/ASC.Files/Client --cache-folder ../../../yarn && \
+    yarn add ../../../$common --cwd products/ASC.Files/Client --cache-folder ../../../yarn && \
+    yarn install --cwd products/ASC.Files/Client --frozen-lockfile || (cd products/ASC.Files/Client && npm i && cd ../../../) && \
+    npm run build --prefix products/ASC.Files/Client && \
+    mkdir -p /var/www/products/ASC.Files/client && \
+    cp -Rf products/ASC.Files/Client/build/* /var/www/products/ASC.Files/client && \
+    mkdir -p /var/www/products/ASC.Files/client/products/files
+
+RUN cd /app/onlyoffice/src/ && \
+    component=$(ls  web/ASC.Web.Components/asc-web-components-v1.*.tgz) && \
+    common=$(ls web/ASC.Web.Common/asc-web-common-v1.*.tgz) && \
+    yarn remove asc-web-components asc-web-common --cwd products/ASC.People/Client && \
    yarn add ../../../$component --cwd products/ASC.People/Client --cache-folder ../../../yarn && \
-	yarn add ../../../$common --cwd products/ASC.People/Client --cache-folder ../../../yarn && \
+    yarn add ../../../$common --cwd products/ASC.People/Client --cache-folder ../../../yarn && \
    yarn install --cwd products/ASC.People/Client --frozen-lockfile || (cd products/ASC.People/Client && npm i && cd ../../../) && \
    npm run build --prefix products/ASC.People/Client && \
    mkdir -p /var/www/products/ASC.People/client && \
@ -113,12 +131,21 @@ RUN cd /app/onlyoffice/src/ && \

 RUN cd /app/onlyoffice/src/ && \
    rm -f /etc/nginx/conf.d/* && \
-    cp -rf config/nginx/onlyoffice*.conf /etc/nginx/conf.d/ && \
+    mkdir -p /var/www/public/ && cp -f public/* /var/www/public/ && \
    mkdir -p /app/onlyoffice/config/ && cp -rf config/* /app/onlyoffice/config/ && \
+    cp -f config/nginx/onlyoffice*.conf /etc/nginx/conf.d/ && \
+    mkdir -p /etc/nginx/includes/ && cp -f config/nginx/includes/onlyoffice*.conf /etc/nginx/includes/ && \
    sed -e 's/#//' -i /etc/nginx/conf.d/onlyoffice.conf && \
    cd products/ASC.People/Server && \
    dotnet -d publish -o /var/www/products/ASC.People/server && \
    cd ../../../ && \
+    cd products/ASC.Files/Server && \
+    dotnet -d publish -o /var/www/products/ASC.Files/server && \
+    cp -avrf DocStore /var/www/products/ASC.Files/server/ && \
+    cd ../../../ && \
+    cd products/ASC.Files/Service && \
+    dotnet -d publish -o /var/www/products/ASC.Files/service && \
+    cd ../../../ && \
    cd web/ASC.Web.Api && \
    dotnet -d publish -o /var/www/studio/api && \
    cd ../../ && \
@ -128,25 +155,34 @@ RUN cd /app/onlyoffice/src/ && \
    cd common/services/ASC.Notify && \
    dotnet -d publish -o /var/www/services/notify && \
    cd ../../../ && \
+    cd common/services/ASC.ApiSystem && \
+    dotnet -d publish -o /var/www/services/apisystem && \
+    cd ../../../ && \
+    cd common/services/ASC.UrlShortener.Svc && \
+    dotnet -d publish -o /services/urlshortener/service && \
+    cd ../../../ && \
+    yarn install --cwd common/ASC.UrlShortener --frozen-lockfile && \
+    mkdir -p /var/www/services/urlshortener/client && cp -Rf common/ASC.UrlShortener/* /var/www/services/urlshortener/client && \
    cd common/services/ASC.Studio.Notify && \
    dotnet -d publish -o /var/www/services/studio.notify

 COPY config/mysql/conf.d/mysql.cnf /etc/mysql/conf.d/mysql.cnf
 COPY config/supervisor/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+COPY config/mysql/dotnet_dump.sql /app/onlyoffice/dotnet_dump.sql

-RUN sed -i 's/172.18.0.5/localhost/' /app/onlyoffice/config/appsettings.test.json
+RUN sed -i 's/Server=.*;Port=/Server=127.0.0.1;Port=/' /app/onlyoffice/config/appsettings.test.json

 RUN mkdir -p /var/mysqld/ && \
    chown -R mysql:mysql /var/lib/mysql /var/run/mysqld /var/mysqld/ && \
-    service mysql start && \
+    sudo -u mysql bash -c "/usr/bin/pidproxy /var/mysqld/mysqld.pid /usr/bin/mysqld_safe --pid-file=/var/mysqld/mysqld.pid &" && \
+    sleep 5s && \
    mysql -e "CREATE DATABASE IF NOT EXISTS onlyoffice CHARACTER SET utf8 COLLATE 'utf8_general_ci'" && \
-    mysql -D "onlyoffice" < /app/onlyoffice/src/sql/app.sql && \
-    mysql -D "onlyoffice" < /app/onlyoffice/src/sql/app.data.sql && \
+    mysql -D "onlyoffice" < /app/onlyoffice/dotnet_dump.sql && \
    mysql -D "onlyoffice" -e 'CREATE USER IF NOT EXISTS "onlyoffice_user"@"localhost" IDENTIFIED WITH mysql_native_password BY "onlyoffice_pass";' && \
-    mysql -D "onlyoffice" -e 'GRANT ALL PRIVILEGES ON *.* TO 'onlyoffice_user'@'localhost' IDENTIFIED BY "onlyoffice_pass";' && \
+    mysql -D "onlyoffice" -e 'GRANT ALL PRIVILEGES ON *.* TO 'onlyoffice_user'@'localhost';' && \
    mysql -D "onlyoffice" -e 'UPDATE core_user SET email = "paul.bannov@gmail.com";' && \
    mysql -D "onlyoffice" -e 'UPDATE core_usersecurity SET pwdhash = "vLFfghR5tNV3K9DKhmwArV+SbjWAcgZZzIDTnJ0JgCo=", pwdhashsha512 = "USubvPlB+ogq0Q1trcSupg==";' && \
-    service mysql stop
+    killall -u mysql -n mysql

 RUN rm -rf /var/lib/apt/lists/*

--- a/build/install/docker/config/mysql/dotnet_dump.sql
+++ b/build/install/docker/config/mysql/dotnet_dump.sql
--- a/build/install/docker/config/supervisor/supervisord.conf
+++ b/build/install/docker/config/supervisor/supervisord.conf
@ -9,46 +9,80 @@ environment=PATH=/usr/local/sbin:/usr/bin:/bin:/usr/local/bin
 user=mysql

 [program:kafka]
-directory=/root/kafka_2.12-2.2.1/
-command=/root/kafka_2.12-2.2.1/bin/kafka-server-start.sh /root/kafka_2.12-2.2.1/config/server.properties
+directory=/root/kafka_2.12-2.5.0/
+command=/root/kafka_2.12-2.5.0/bin/kafka-server-start.sh /root/kafka_2.12-2.5.0/config/server.properties
 autostart=true
 autorestart=true

 [program:kafka_zookeeper]
-directory=/root/kafka_2.12-2.2.1/
-command=/root/kafka_2.12-2.2.1/bin/zookeeper-server-start.sh /root/kafka_2.12-2.2.1/config/zookeeper.properties
+directory=/root/kafka_2.12-2.5.0/
+command=/root/kafka_2.12-2.5.0/bin/zookeeper-server-start.sh /root/kafka_2.12-2.5.0/config/zookeeper.properties
 autostart=true
 autorestart=true

 [program:api]
 directory=/var/www/studio/api/
-command=dotnet ASC.Web.Api.dll --urls=http://0.0.0.0:5000 --pathToConf=/app/onlyoffice/config/ --$STORAGE_ROOT=/app/onlyoffice/data/ --ENVIRONMENT=test
+command=dotnet ASC.Web.Api.dll --urls=http://0.0.0.0:5000 --pathToConf=/app/onlyoffice/config/ --$STORAGE_ROOT=/app/onlyoffice/data/ --log:dir=/var/log/onlyoffice --log:name=api
 autostart=true
 autorestart=true
+user=root
+environment=ASPNETCORE_ENVIRONMENT=test

-[program:notify]
-directory=/var/www/services/notify/
-command=dotnet ASC.Notify.dll --urls=http://0.0.0.0:5005 --pathToConf=/app/onlyoffice/config/ --$STORAGE_ROOT=/app/onlyoffice/data/ --ENVIRONMENT=test
+[program:api_system]
+directory=/var/www/services/apisystem
+command=dotnet ASC.ApiSystem.dll --urls=http://0.0.0.0:5010 --pathToConf=/app/onlyoffice/config/ --$STORAGE_ROOT=/app/onlyoffice/data/ --log:dir=/var/log/onlyoffice --log:name=apisystem 
 autostart=true
 autorestart=true
+user=root
+environment=ASPNETCORE_ENVIRONMENT=test
+
+[program:urlshortener]
+directory=/services/urlshortener/service 
+command=dotnet ASC.UrlShortener.Svc.dll --urls=http://0.0.0.0:5015 --pathToConf=/app/onlyoffice/config/ --$STORAGE_ROOT=/app/onlyoffice/data/ --log:dir=/var/log/onlyoffice --log:name=urlshortener 
+autostart=true
+autorestart=true
+user=root
+environment=ASPNETCORE_ENVIRONMENT=test

 [program:studio_notify]
 directory=/var/www/services/studio.notify/
-command=dotnet ASC.Studio.Notify.dll --urls=http://0.0.0.0:5006 --pathToConf=/app/onlyoffice/config/ --$STORAGE_ROOT=/app/onlyoffice/data/ --ENVIRONMENT=test
+command=dotnet ASC.Studio.Notify.dll --urls=http://0.0.0.0:5006 --pathToConf=/app/onlyoffice/config/ --$STORAGE_ROOT=/app/onlyoffice/data/ --log:dir=/var/log/onlyoffice --log:name=notify.studio  --core:products:folder=/var/www/products/ --core:products:subfolder=server
 autostart=true
 autorestart=true
+user=root
+environment=ASPNETCORE_ENVIRONMENT=test

 [program:people]
 directory=/var/www/products/ASC.People/server/
-command=dotnet ASC.People.dll --urls=http://0.0.0.0:5004 --pathToConf=/app/onlyoffice/config/  --$STORAGE_ROOT=/app/onlyoffice/data/ --ENVIRONMENT=test
+command=dotnet ASC.People.dll --urls=http://0.0.0.0:5004 --pathToConf=/app/onlyoffice/config/  --$STORAGE_ROOT=/app/onlyoffice/data/ --log:dir=/var/log/onlyoffice/ --log:name=people
 autostart=true
 autorestart=true
+user=root
+environment=ASPNETCORE_ENVIRONMENT=test
+
+[program:files]
+directory=/var/www/products/ASC.Files/server/
+command=dotnet ASC.Files.dll --urls=http://0.0.0.0:5007 --pathToConf=/app/onlyoffice/config/  --$STORAGE_ROOT=/app/onlyoffice/data/  --log:dir=/var/log/onlyoffice/ --log:name=files
+autostart=true
+autorestart=true
+user=root
+environment=ASPNETCORE_ENVIRONMENT=test
+
+[program:files_services]
+directory=/var/www/products/ASC.Files/service
+command=dotnet ASC.Files.Service.dll --urls=http://0.0.0.0:5009 --pathToConf=/app/onlyoffice/config/  --$STORAGE_ROOT=/app/onlyoffice/data/ --log:dir=/var/log/onlyoffice/ --log:name=filesservice
+autostart=true
+autorestart=true
+user=root
+environment=ASPNETCORE_ENVIRONMENT=test

 [program:studio]
 directory=/var/www/studio/server/
-command=dotnet ASC.Web.Studio.dll --urls=http://0.0.0.0:5003 --pathToConf=/app/onlyoffice/config/  --$STORAGE_ROOT=/app/onlyoffice/data/ --ENVIRONMENT=test
+command=dotnet ASC.Web.Studio.dll --urls=http://0.0.0.0:5003 --pathToConf=/app/onlyoffice/config/  --$STORAGE_ROOT=/app/onlyoffice/data/ --log:dir=/var/log/onlyoffice --log:name=web
 autostart=true
 autorestart=true
+user=root
+environment=ASPNETCORE_ENVIRONMENT=test

 [program:nginx]
 command=/usr/sbin/nginx -g "daemon off;"