Merge release/v8.1.0 into master (#110)

* Merge release/v8.1.0 into master * And the ability to separate cache and service files (#112) * Add jq into utils (#114) --------- Co-authored-by: Valeria Bagisheva <[email protected]>
ONLYOFFICE · Jun 24, 2024 · fb67fe8 · fb67fe8
1 parent a9db088
commit fb67fe8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git 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

diff --git 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 && \

diff --git 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"
   }
 }'