Merge pull request #75 from ONLYOFFICE/release/v7.3.2

Merge release/v7.3.2 into master

.env

@@ -10,6 +10,12 @@ COMPANY_NAME=onlyoffice
 # `-ee` - Enterprise Edition
 PRODUCT_EDITION=
 
+# ONLYOFFICE Docs version
+# Unless otherwise specified, the latest up-to-date version will be used
+# Example:
+# RELEASE_VERSION=-7.2.2
+RELEASE_VERSION=
+
 # Prefix in the name of your repository in Docker Hub
 PREFIX_NAME=docs
 

Dockerfile

@@ -18,7 +18,8 @@ RUN yum install sudo -y && \
 FROM ds-base AS ds-service
 ARG TARGETARCH
 ARG PRODUCT_EDITION=
-ARG PRODUCT_URL=http://download.onlyoffice.com/install/documentserver/linux/onlyoffice-documentserver$PRODUCT_EDITION.$TARGETARCH.rpm
+ARG RELEASE_VERSION
+ARG PRODUCT_URL=https://download.onlyoffice.com/install/documentserver/linux/onlyoffice-documentserver$PRODUCT_EDITION$RELEASE_VERSION.$TARGETARCH.rpm
 ENV TARGETARCH=$TARGETARCH
 RUN useradd --no-create-home --shell /sbin/nologin nginx && \
     yum -y updateinfo && \
@@ -191,8 +192,7 @@ COPY --from=ds-service \
     /usr/lib64/libDjVuFile.so \
     /usr/lib64/libEpubFile.so \
     /usr/lib64/libFb2File.so \
-    /usr/lib64/libPdfReader.so \
-    /usr/lib64/libPdfWriter.so \
+    /usr/lib64/libPdfFile.so \
     /usr/lib64/libHtmlFile2.so \
     /usr/lib64/libHtmlRenderer.so \
     /usr/lib64/libUnicodeConverter.so \
@@ -252,10 +252,15 @@ ENTRYPOINT /var/www/onlyoffice/documentserver-example/docker-entrypoint.sh npm s
 FROM alpine:latest AS utils
 LABEL maintainer Ascensio System SIA <[email protected]>
 RUN apk add bash postgresql-client mysql-client curl wget && \
+    curl -LO \
+      https://storage.googleapis.com/kubernetes-release/release/`curl \
+      -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl && \
+    chmod +x ./kubectl && \
+    mv ./kubectl /usr/local/bin/kubectl && \
     addgroup --system --gid 101 ds && \
     adduser --system -G ds -h /home/ds --shell /bin/bash --uid 101 ds && \
-    mkdir /sql && \
-    chown -R ds:ds /sql
+    mkdir /scripts && \
+    chown -R ds:ds /scripts
 USER ds
 
 FROM statsd/statsd AS metrics

README.md

@@ -65,6 +65,8 @@ Possible values:
   - `-de`. For commercial Developer Edition,
   - `-ee`. For commercial Enterprise Edition.
 
+If you want to use a ONLYOFFICE Docs version other than the latest one, specify the version you need in the `RELEASE_VERSION` variable. If no value is defined, the latest up-to-date version will be used.
+
 #### 2. Run the build
 
 To start the build, run the following command:

build.sh

@@ -2,4 +2,6 @@
 
 source .env
 export DOCKER_BUILDKIT=1
-docker-compose build --build-arg PRODUCT_EDITION=$PRODUCT_EDITION
+docker-compose build \
+  --build-arg PRODUCT_EDITION=$PRODUCT_EDITION \
+  --build-arg RELEASE_VERSION=$RELEASE_VERSION