From f4dbe8ab8c74282af6e7c31a758723f6cedef6da Mon Sep 17 00:00:00 2001
From: VyacheslavSemin <vyacheslav.semin@onlyoffice.com>
Date: Thu, 2 May 2024 12:11:03 +0000
Subject: [PATCH 1/3] Merge release/v8.1.0 into master

---
 .env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env b/.env
index 363ce49..1d6ac5f 100644
--- a/.env
+++ b/.env
@@ -14,7 +14,7 @@ PRODUCT_EDITION=
 # Unless otherwise specified, the latest up-to-date version will be used
 # Example:
 # RELEASE_VERSION=-7.2.2
-RELEASE_VERSION=-8.0.1
+RELEASE_VERSION=-8.1.0
 
 # Prefix in the name of your repository in Docker Hub
 PREFIX_NAME=docs

From fa0356f25543e52c4db8f38fd8f117c896c5721a Mon Sep 17 00:00:00 2001
From: Vyacheslav Semin <vyacheslav.semin@onlyoffice.com>
Date: Fri, 17 May 2024 15:44:36 +0300
Subject: [PATCH 2/3] And the ability to separate cache and service files
 (#112)

---
 docker-entrypoint.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index c86a847..9e4acf2 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -139,8 +139,17 @@ export NODE_CONFIG='{
   },
   "storage": {
     "fs": {
+      "folderPath": "/var/lib/'${COMPANY_NAME}'/documentserver/App_Data/cache/files/'${STORAGE_SUBDIRECTORY_NAME:-latest}'",
       "secretString": "'${SECURE_LINK_SECRET:-verysecretstring}'"
-    }
+    },
+    "storageFolderName": "files/'${STORAGE_SUBDIRECTORY_NAME:-latest}'"
+  },
+  "persistentStorage": {
+    "fs": {
+      "folderPath": "/var/lib/'${COMPANY_NAME}'/documentserver/App_Data/cache/files",
+      "secretString": "'${SECURE_LINK_SECRET:-verysecretstring}'"
+    },
+    "storageFolderName": "files"
   }
 }'
 

From 9b44d44aa55a1392b7a0b2756984b4e3bf46ec50 Mon Sep 17 00:00:00 2001
From: Valeria Bagisheva <104082183+lemmav@users.noreply.github.com>
Date: Tue, 11 Jun 2024 09:39:12 +0300
Subject: [PATCH 3/3] Add jq into utils (#114)

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 0134185..460098b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -252,7 +252,7 @@ FROM python:3.11 AS builder
 RUN pip install redis psycopg2  PyMySQL pika python-qpid-proton func_timeout requests kubernetes flask
 FROM python:3.11-slim AS utils
 COPY --from=builder /usr/local/lib/python3.11/site-packages /usr/local/lib/python3.11/site-packages
-RUN apt update  && apt install -y postgresql-client default-mysql-client curl wget && \
+RUN apt update  && apt install -y postgresql-client default-mysql-client curl wget jq && \
     curl -LO \
       https://storage.googleapis.com/kubernetes-release/release/`curl \
       -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl && \