diff --git a/build/install/docker/Dockerfile b/build/install/docker/Dockerfile index eb35ba5200..c89935e062 100644 --- a/build/install/docker/Dockerfile +++ b/build/install/docker/Dockerfile @@ -141,6 +141,7 @@ RUN cd /app/onlyoffice/src/ && \ 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 && \ @@ -167,16 +168,16 @@ RUN cd /app/onlyoffice/src/ && \ 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/ && \ 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';' && \ mysql -D "onlyoffice" -e 'UPDATE core_user SET email = "paul.bannov@gmail.com";' && \ diff --git a/build/install/docker/config/supervisor/supervisord.conf b/build/install/docker/config/supervisor/supervisord.conf index f379b7826f..d44e5e15c2 100644 --- a/build/install/docker/config/supervisor/supervisord.conf +++ b/build/install/docker/config/supervisor/supervisord.conf @@ -22,51 +22,67 @@ 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: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/ --ENVIRONMENT=test +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: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/ --ENVIRONMENT=test -autostart=true -autorestart=true - -[program:notify] +[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/ --ENVIRONMENT=test +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/ --ENVIRONMENT=test +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;"