Fixes as per testing, partial display fixes
This commit is contained in:
parent
3b5e1bdec5
commit
c1e8b9267d
@ -170,6 +170,9 @@
|
|||||||
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-connect-amazon.aspx")%>">Connecting Amazon S3 bucket as a cache to ONLYOFFICE Docs</a></li>
|
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-connect-amazon.aspx")%>">Connecting Amazon S3 bucket as a cache to ONLYOFFICE Docs</a></li>
|
||||||
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/GettingStarted/205_configure_jwt.ascx" /></li>
|
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/GettingStarted/205_configure_jwt.ascx" /></li>
|
||||||
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-configure-ipfilter.aspx")%>">Configuring IP filter for ONLYOFFICE Docs</a></li>
|
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-configure-ipfilter.aspx")%>">Configuring IP filter for ONLYOFFICE Docs</a></li>
|
||||||
|
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/TipsTricks/181_connect_dameng.ascx" /></li>
|
||||||
|
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/TipsTricks/182_connect_oracle.ascx" /></li>
|
||||||
|
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/TipsTricks/183_connect_mssql.ascx" /></li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
<li><h6>System requirements</h6>
|
<li><h6>System requirements</h6>
|
||||||
@ -279,6 +282,9 @@
|
|||||||
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-connect-amazon.aspx")%>">Connecting Amazon S3 bucket as a cache to ONLYOFFICE Docs</a></li>
|
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-connect-amazon.aspx")%>">Connecting Amazon S3 bucket as a cache to ONLYOFFICE Docs</a></li>
|
||||||
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/GettingStarted/205_configure_jwt.ascx" /></li>
|
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/GettingStarted/205_configure_jwt.ascx" /></li>
|
||||||
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-configure-ipfilter.aspx")%>">Configuring IP filter for ONLYOFFICE Docs</a></li>
|
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-configure-ipfilter.aspx")%>">Configuring IP filter for ONLYOFFICE Docs</a></li>
|
||||||
|
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/TipsTricks/181_connect_dameng.ascx" /></li>
|
||||||
|
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/TipsTricks/182_connect_oracle.ascx" /></li>
|
||||||
|
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/TipsTricks/183_connect_mssql.ascx" /></li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
<li><h6>Developing</h6>
|
<li><h6>Developing</h6>
|
||||||
|
@ -47,6 +47,9 @@
|
|||||||
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-connect-amazon.aspx")%>">Connecting Amazon S3 bucket as a cache to ONLYOFFICE Docs</a></li>
|
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-connect-amazon.aspx")%>">Connecting Amazon S3 bucket as a cache to ONLYOFFICE Docs</a></li>
|
||||||
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/GettingStarted/205_configure_jwt.ascx" /></li>
|
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/GettingStarted/205_configure_jwt.ascx" /></li>
|
||||||
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-configure-ipfilter.aspx")%>">Configuring IP filter for ONLYOFFICE Docs</a></li>
|
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-configure-ipfilter.aspx")%>">Configuring IP filter for ONLYOFFICE Docs</a></li>
|
||||||
|
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/TipsTricks/181_connect_dameng.ascx" /></li>
|
||||||
|
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/TipsTricks/182_connect_oracle.ascx" /></li>
|
||||||
|
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/TipsTricks/183_connect_mssql.ascx" /></li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
<li><h6>System requirements</h6>
|
<li><h6>System requirements</h6>
|
||||||
|
@ -40,6 +40,9 @@
|
|||||||
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-connect-amazon.aspx")%>">Connecting Amazon S3 bucket as a cache to ONLYOFFICE Docs</a></li>
|
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-connect-amazon.aspx")%>">Connecting Amazon S3 bucket as a cache to ONLYOFFICE Docs</a></li>
|
||||||
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/GettingStarted/205_configure_jwt.ascx" /></li>
|
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/GettingStarted/205_configure_jwt.ascx" /></li>
|
||||||
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-configure-ipfilter.aspx")%>">Configuring IP filter for ONLYOFFICE Docs</a></li>
|
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-configure-ipfilter.aspx")%>">Configuring IP filter for ONLYOFFICE Docs</a></li>
|
||||||
|
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/TipsTricks/181_connect_dameng.ascx" /></li>
|
||||||
|
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/TipsTricks/182_connect_oracle.ascx" /></li>
|
||||||
|
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/TipsTricks/183_connect_mssql.ascx" /></li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
<li><h6>Developing</h6>
|
<li><h6>Developing</h6>
|
||||||
|
@ -39,6 +39,9 @@
|
|||||||
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-connect-amazon.aspx")%>">Connecting Amazon S3 bucket as a cache to ONLYOFFICE Docs</a></li>
|
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-connect-amazon.aspx")%>">Connecting Amazon S3 bucket as a cache to ONLYOFFICE Docs</a></li>
|
||||||
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/GettingStarted/205_configure_jwt.ascx" /></li>
|
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/GettingStarted/205_configure_jwt.ascx" /></li>
|
||||||
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-configure-ipfilter.aspx")%>">Configuring IP filter for ONLYOFFICE Docs</a></li>
|
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-configure-ipfilter.aspx")%>">Configuring IP filter for ONLYOFFICE Docs</a></li>
|
||||||
|
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/TipsTricks/181_connect_dameng.ascx" /></li>
|
||||||
|
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/TipsTricks/182_connect_oracle.ascx" /></li>
|
||||||
|
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/TipsTricks/183_connect_mssql.ascx" /></li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
<li><h6>System requirements</h6>
|
<li><h6>System requirements</h6>
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="notehelp">The current guide suggests that a test bench has already been implemented in a separate feature/damengdb-compose branch: https://github.com/ONLYOFFICE/Docker-DocumentServer/tree/feature/damengdb-compose/tests/damengdb</div>
|
<div class="notehelp">The current guide suggests that a test bench has already been implemented in a separate feature/damengdb-compose branch: https://github.com/ONLYOFFICE/Docker-DocumentServer/tree/feature/damengdb-compose/tests/damengdb</div>
|
||||||
<h2>Connecting to Dameng server</h2>
|
<h2>Connecting to Dameng server</h2>
|
||||||
<p>The Document Server has several variables, <b><em>DB_TYPE DB_HOST DB_USER DB_PASSWORD DB_PORT</em></b>, that allow you to customize your database connection. However, currently only MYSQL/MariaDB and PostgreSQL are supported officially.</p>
|
<p>The Document Server has several variables, <b><em>DB_TYPE</em></b>, <b><em>DB_HOST</em></b>, <b><em>DB_USER</em></b>, <b><em>DB_NAME</em></b>, <b><em>DB_PORT</em></b>, that allow you to customize your database connection. However, currently only MYSQL/MariaDB and PostgreSQL are supported officially.</p>
|
||||||
<p>To connect DamengDb, modify the entry point script and add connection conditions and parameters to the initialization entry point script of the Document Server image:</p>
|
<p>To connect DamengDb, modify the entry point script and add connection conditions and parameters to the initialization entry point script of the Document Server image:</p>
|
||||||
<ol>
|
<ol>
|
||||||
<li>
|
<li>
|
||||||
@ -39,17 +39,18 @@
|
|||||||
<li><b>DB_TYPE</b>: damengdb</li>
|
<li><b>DB_TYPE</b>: damengdb</li>
|
||||||
<li><b>DB_HOST</b>: Name (dns name) of the database service in compose file</li>
|
<li><b>DB_HOST</b>: Name (dns name) of the database service in compose file</li>
|
||||||
<li><b>DB_USER</b>: Username</li>
|
<li><b>DB_USER</b>: Username</li>
|
||||||
<li><b>DB_PASS</b>: User password</li>
|
<li><b>DB_NAME</b></li>
|
||||||
<li><b>DB_PORT</b>: Service port with database</li>
|
<li><b>DB_PORT</b>: Service port with database</li>
|
||||||
</ul>
|
</ul>
|
||||||
<p>Mount the binary directory from the damengdb container so that the document server container has access to the <b>disql</b> utility. Please refer to the <a href="https://github.com/ONLYOFFICE/Docker-DocumentServer/blob/feature/damengdb-compose/tests/damengdb/docker-compose.yml#L34" target="_blank">docker-compose.yml</a> to learn more.</p>
|
<p>Mount the binary directory from the damengdb container so that the document server container has access to the <b>disql</b> utility. Please refer to the <a href="https://github.com/ONLYOFFICE/Docker-DocumentServer/blob/feature/damengdb-compose/tests/damengdb/docker-compose.yml#L33" target="_blank">docker-compose.yml</a> to learn more.</p>
|
||||||
<h2>Running a stand</h2>
|
<h2>Running a stand</h2>
|
||||||
<p>To start the stand, execute the following commands:</p>
|
<p>To start the stand, execute the following commands:</p>
|
||||||
<ol>
|
<ol>
|
||||||
<li><pre><code>git clone -b feature/damentdb-compose https://github.com/ONLYOFFICE/Docker-DocumentServer.git</code></pre></li>
|
<li><pre><code>git clone --single-branch --branch feature/damengdb-compose https://github.com/ONLYOFFICE/Docker-DocumentServer.git</code></pre></li>
|
||||||
<li><pre><code>cd Docker-DocumentServer/tests/damengdb/</code></pre></li>
|
<li><pre><code>cd Docker-DocumentServer/tests/damengdb/</code></pre></li>
|
||||||
<li><pre><code>docker compose up –d</code></pre></li>
|
<li><pre><code>docker compose build</code></pre></li>
|
||||||
|
<li><pre><code>docker compose up -d</code></pre></li>
|
||||||
</ol>
|
</ol>
|
||||||
<div class="notehelp">The database image must be available on hub.docker. We have uploaded the image v8.1.2.128 for your convenience: https://hub.docker.com/r/danilaworker/damengdb</div>
|
<div class="notehelp">The database image must be available on hub.docker. We have uploaded the image v8.1.2.128 for your convenience: https://hub.docker.com/r/onlyoffice/damengdb</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
@ -24,7 +24,7 @@
|
|||||||
<li>
|
<li>
|
||||||
Install ONLYOFFICE Docs:
|
Install ONLYOFFICE Docs:
|
||||||
<pre><code>sudo docker run -i -t -d -p 80:80 --name onlyoffice \
|
<pre><code>sudo docker run -i -t -d -p 80:80 --name onlyoffice \
|
||||||
onlyoffice/documentserver-ee</code></pre>
|
<span class="community_display">onlyoffice/documentserver</span><span class="enterprise_display">onlyoffice/documentserver-ee</span><span class="developer_display">onlyoffice/documentserver-de</span></code></pre>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
Install MsSQL on the same or a separate server:
|
Install MsSQL on the same or a separate server:
|
||||||
@ -53,7 +53,7 @@ nano /etc/onlyoffice/documentserver/local.json
|
|||||||
"CoAuthoring": {
|
"CoAuthoring": {
|
||||||
"sql": {
|
"sql": {
|
||||||
"type": "mssql",
|
"type": "mssql",
|
||||||
"dbHost": "<mssql_ip_or_hostname>",
|
"dbHost": "mssql_ip_or_hostname",
|
||||||
"dbPort": "8080",
|
"dbPort": "8080",
|
||||||
"dbName": "onlyoffice",
|
"dbName": "onlyoffice",
|
||||||
"dbUser": "sa",
|
"dbUser": "sa",
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
<li>
|
<li>
|
||||||
Install ONLYOFFICE Docs:
|
Install ONLYOFFICE Docs:
|
||||||
<pre><code>sudo docker run -i -t -d -p 80:80 --name onlyoffice \
|
<pre><code>sudo docker run -i -t -d -p 80:80 --name onlyoffice \
|
||||||
onlyoffice/documentserver-ee</code></pre>
|
<span class="community_display">onlyoffice/documentserver</span><span class="enterprise_display">onlyoffice/documentserver-ee</span><span class="developer_display">onlyoffice/documentserver-de</span></code></pre>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
Install Oracle on the same or a separate server:
|
Install Oracle on the same or a separate server:
|
||||||
@ -50,12 +50,13 @@ nano /etc/onlyoffice/documentserver/local.json
|
|||||||
"CoAuthoring": {
|
"CoAuthoring": {
|
||||||
"sql": {
|
"sql": {
|
||||||
"type": "oracle",
|
"type": "oracle",
|
||||||
"dbHost": "<oracle_ip_or_hostname>",
|
"dbHost": "oracle_ip_or_hostname",
|
||||||
"dbPort": "8080",
|
"dbPort": "8080",
|
||||||
"dbName": "xepdb1",
|
"dbName": "xepdb1",
|
||||||
"dbUser": "onlyoffice",
|
"dbUser": "onlyoffice",
|
||||||
"dbPass": "onlyoffice"
|
"dbPass": "onlyoffice"
|
||||||
...
|
...
|
||||||
|
supervisorctl restart all
|
||||||
</code></pre>
|
</code></pre>
|
||||||
</li>
|
</li>
|
||||||
</ol>
|
</ol>
|
||||||
|
Loading…
Reference in New Issue
Block a user