Add build with custom package version

2026-04-07 14:01:38 +08:00 · 2023-04-12 13:51:39 +03:00
11 changed files with 81 additions and 363 deletions
--- a/.github/workflows/4testing-build.yml
+++ b/.github/workflows/4testing-build.yml
@ -61,7 +61,7 @@ jobs:
            echo "None of the editions are selected."
            exit 1
          fi
-          echo "editions=$(jq -n -c --arg s "${EDITIONS[*]}" '($s|split(" "))')" >> $GITHUB_OUTPUT
+          echo "::set-output name=editions::$(jq -n -c --arg s "${EDITIONS[*]}" '($s|split(" "))')"
    outputs:
      editions: ${{ steps.matrix.outputs.editions }}

@ -124,8 +124,8 @@ jobs:
          BUILD_NUMBER=${{ github.event.inputs.build }}

          export PRODUCT_EDITION
-          export PACKAGE_VERSION=${PRODUCT_VERSION}-${BUILD_NUMBER}
-          export PACKAGE_BASEURL=${{ secrets.REPO_BASEURL }}
+          export PACKAGE_VERSION=${PRODUCT_VERSION}-${BUILD_NUMBER}~stretch
+          export PACKAGE_BASEURL=${{ secrets.REPO_BASEURL }}/${BUILD_CHANNEL}
          export BUILD_CHANNEL
          export PLATFORM
          export DOCKERFILE=Dockerfile
--- a/.github/workflows/cron-rebuild-trigger.yml
+++ b/.github/workflows/cron-rebuild-trigger.yml
@ -1,22 +0,0 @@
---
-name: Trigger 4testing rebuild
-
-run-name: "Weekly 4testing rebuild trigger"
-
-on: 
-  schedule:
-    # Run every Saturday at 10 p.m.   
-    - cron: '00 22 * * 6'
-  
-jobs: 
-  trigger-rebuild:
-    name: "trigget-rebuild"
-    runs-on: "ubuntu-latest"
-    steps:
-      - name: Rebuild 4testing manualy
-        env: 
-          GITHUB_TOKEN: ${{ secrets.TOKEN }}
-        run: |
-          gh workflow run rebuild.yml \
-              --repo ONLYOFFICE/Docker-DocumentServer \
-              -f repo=4test
--- a/.github/workflows/rebuild.yml
+++ b/.github/workflows/rebuild.yml
@ -1,224 +0,0 @@
---
-name: Rebuild Docker-Documentserver 
-
-run-name: >
-        Rebuild DocumentServer with secure updates for repo: ${{ github.event.inputs.repo }}
-
-on:
-  workflow_dispatch:
-    inputs:
-      repo:
-        type: choice
-        description: Please, choose upload repo..
-        options:
-        - '4test'
-        - 'stable'
-
-permissions:
-  # All other permissions are set to none
-  contents: read
-  # Technically read access while waiting for images should be more than enough. However,
-  # there is a bug in GitHub Actions/Packages and in case private repositories are used, you get a permission
-  # denied error when attempting to just pull private image, changing the token permission to write solves the
-  # issue. This is not dangerous, because if it is for "ONLYOFFICE/Docker-DocumentServer", only maintainers can use ds-rebuild.yaml
-  # If it is for a fork, then the token is read-only anyway.
-  packages: read
-
-env: 
-  COMPANY_NAME: "onlyoffice"
-  PRODUCT_NAME: "documentserver" 
-  REGISTRY_URL: "https://hub.docker.com/v2/repositories"  
-
-jobs:
-  rebuild-info:
-    name: "Rebuild-info"
-    runs-on: "ubuntu-22.04"
-    env:
-      REPO_INPUTS: ${{ github.event.inputs.repo }}
-      EVENT: ${{ github.event_name }}
-    outputs: 
-      stable-versions: ${{ steps.selective-checks.outputs.stable-versions }}
-      ucs-versions: ${{ steps.selective-checks.outputs.ucs-versions }}
-      minor-tags: ${{ steps.selective-checks.outputs.minor-tags }}
-      ucs-rebuild-condition: ${{ steps.selective-checks.outputs.ucs-rebuild-condition }}
-      prefix-name: ${{ steps.selective-checks.outputs.prefix-name }}
-      repo: ${{ steps.selective-checks.outputs.repo }}
-    steps:
-      - name: Selective checks
-        id: selective-checks
-        run: |
-            set -e
-
-            REPO=${REPO_INPUTS:-"4test"}
-
-            if [ "${REPO}" == "stable" ]; then
-                 UCS_REBUILD=true
-                 UCS_VERSIONS=($(curl -s -H -X ${REGISTRY_URL}/${COMPANY_NAME}/${PRODUCT_NAME}-ucs/tags/?page_size=100 | \
-                            jq -r '.results|.[]|.name' | grep -oxE '[0-9]{1,}.[0-9]{1,}.[0-9]{1,}.1' || true))
-                 echo "ucs-versions=$(jq -c -n '$ARGS.positional' --args "${UCS_VERSIONS[@]}")" >> "$GITHUB_OUTPUT"
-            elif
-               [ "${REPO}" == "4test" ]; then 
-                 UCS_REBUILD=false
-                 PREFIX_NAME=4testing-
-            fi
-            
-            STABLE_VERSIONS=($(curl -s -H -X ${REGISTRY_URL}/${COMPANY_NAME}/${PRODUCT_NAME}/tags/?page_size=100 | \
-                            jq -r '.results|.[]|.name' | grep -oxE '[0-9]{1,}.[0-9]{1,}.[0-9]{1,}.1' || true))
-                            
-            # When rebuilding stable versions of the document server, 
-            # it is necessary to determine the version from which the 
-            # minor x.x tag will need to be pushed.        
-            
-            VERSIONS=(${STABLE_VERSIONS[@]})
-            for i in {1..10}; do
-                 if [ -z "${VERSIONS}" ]; then
-                     break
-                 else 
-                     TEMPLATE=${VERSIONS[0]%.*.*}
-                     TEMPLATE_MINOR=$(printf -- '%s\n' "${VERSIONS[@]}" | grep -o -m 1 "${VERSIONS[0]%.*.*}.[0-9].[0-9]")
-                     MINOR_TAGS+=(${TEMPLATE_MINOR%.*})
-            
-                     for v in ${MINOR_TAGS[@]}; do
-                          VERSIONS=(${VERSIONS[@]//${v%.*}.*.*})
-                     done
-                 fi
-            done
-            
-            echo "Stable releases that will be rebuilded"
-            echo "--------------------------------------"
-            echo "${STABLE_VERSIONS[@]}"
-            echo
-            echo 
-            echo "Ucs releases that will be rebuilded"
-            echo "-----------------------------------"
-            echo "${UCS_VERSIONS[@]}"
-            
-            echo "stable-versions=$(jq -c -n '$ARGS.positional' --args "${STABLE_VERSIONS[@]}")" >> "$GITHUB_OUTPUT"
-            echo "minor-tags=${MINOR_TAGS[@]}" >> "$GITHUB_OUTPUT"
-            echo "ucs-rebuild-condition=${UCS_REBUILD}" >> "$GITHUB_OUTPUT"
-            echo "prefix-name=${PREFIX_NAME}" >>  "$GITHUB_OUTPUT"
-            echo "repo=${REPO}" >> "$GITHUB_OUTPUT"
-        shell: bash
-
-  re-build-stable:
-    name: "Rebuild stable:${{ matrix.version }} ${{ matrix.edition }}"
-    needs: [rebuild-info]
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        type: ["stable"]
-        edition: ["", "-ee", "-de"]
-        version: ${{fromJSON(needs.rebuild-info.outputs.stable-versions)}}
-    steps:
-      - name: Checkout code 
-        uses: actions/checkout@v3
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2      
-      - name: Login to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
-     # Determines the new build number based 
-     # on data from the hub.docker registry
-      - name: Declare release number
-        id: release-number
-        env: 
-          REBUILD_VERSION: ${{ matrix.version }}
-        run: |
-          MINOR_VERSION=${REBUILD_VERSION%.*} 
-          LAST_RELEASE=$(curl -s -H -X ${REGISTRY_URL}/${COMPANY_NAME}/${PRODUCT_NAME}/tags/?page_size=100 \
-          | jq -r '.results|.[]|.name' | grep -Eo -m1 "${MINOR_VERSION}.[0-9]{1,}")
-          LAST_RELEASE=${LAST_RELEASE#*.*.*.}
-          echo "release-number=$((LAST_RELEASE+1))" >> "$GITHUB_OUTPUT"   
-        shell: bash  
-    #  Note: Rebuilding images with an 
-    #  extra layer to update security and 
-    #  all dependencies. Update tags got +1 to previous release.
-      - name: Re-build documentserver-stable
-        env:
-          MINOR_TAGS_ST: ${{ needs.rebuild-info.outputs.minor-tags }}
-          VERSION: ${{ matrix.version }}
-          RELEASE_NUMBER: ${{ steps.release-number.outputs.release-number }}
-          PREFIX_NAME: ${{ needs.rebuild-info.outputs.prefix-name }}
-          REPO: ${{ needs.rebuild-info.outputs.repo }}
-          PRODUCT_EDITION: ${{ matrix.edition }}
-        run: |
-            set -eux
-            export PULL_TAG=${VERSION}
-            export TAG=${VERSION%.*}.${RELEASE_NUMBER}
-            export SHORTER_TAG=${VERSION%.*}
-            export SHORTEST_TAG=${VERSION%.*.*}
-            
-            if [ "${REPO}" == "stable" ]; then
-                 MINOR_TAGS=(${MINOR_TAGS_ST})
-                 for v in ${MINOR_TAGS[@]}; do
-                     if [ "${SHORTER_TAG}" == "${v}" ]; then
-                         export PUSH_MAJOR="true"
-                     fi
-                 done
-                 if [ "${SHORTER_TAG}" == "${MINOR_TAGS[0]}" ]; then
-                     export LATEST="true"
-                 fi
-            fi
-            docker buildx bake -f docker-bake.hcl documentserver-stable-rebuild --push
-        shell: bash
-  re-build-ucs:
-    name: "Rebuild ucs: ${{ matrix.version }} ${{ matrix.edition }}"
-    if: needs.rebuild-info.outputs.ucs-rebuild-condition == 'true'
-    needs: [rebuild-info]
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        type: ["ucs"]
-        edition: ["", "-ee"]
-        version: ${{fromJSON(needs.rebuild-info.outputs.ucs-versions)}}
-    steps:
-      - name: Checkout code 
-        uses: actions/checkout@v3
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Login to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
-      # Determines the new build number based 
-      # on data from the hub.docker registry
-      - name: Declare release number
-        id: release-number
-        env: 
-          REBUILD_VERSION: ${{ matrix.version }}
-        run: |
-          MINOR_VERSION=${REBUILD_VERSION%.*} 
-          LAST_RELEASE=$(curl -s -H -X ${REGISTRY_URL}/${COMPANY_NAME}/${PRODUCT_NAME}/tags/?page_size=100 \
-                        | jq -r '.results|.[]|.name' | grep -Eo -m1 "${MINOR_VERSION}.[0-9]{1,}")
-          LAST_RELEASE=${LAST_RELEASE#*.*.*.}
-          echo "release-number=$((LAST_RELEASE+1))" >> "$GITHUB_OUTPUT"
-        shell: bash       
-      #  Note: Rebuilding images with an 
-      #  extra layer to update security and 
-      #  all dependencies. Update tags +1 to previous release.
-      - name: Re-build documentserver-ucs
-        env: 
-          VERSION: ${{ matrix.version }}
-          RELEASE_NUMBER: ${{ steps.release-number.outputs.release-number }}
-          PRODUCT_EDITION: ${{ matrix.edition }}
-        run: |
-            set -eux
-            export PULL_TAG=${VERSION}
-            export TAG=${VERSION%.*}.${RELEASE_NUMBER}
-            export SHORTER_TAG=${VERSION%.*}
-            export SHORTEST_TAG=${VERSION%.*.*}
-          
-            export UCS_REBUILD=true
-            export UCS_PREFIX=-ucs
-          
-            docker buildx bake -f docker-bake.hcl documentserver-stable-rebuild --push
-        shell: bash
--- a/.github/workflows/stable-build.yml
+++ b/.github/workflows/stable-build.yml
@ -8,11 +8,10 @@ on:
        description: 'Tag for release (ex. 1.2.3.45)'
        type: string
        required: true
-      release_number:
-        description: 'Sequence number of the release (ex. x.x.x.<number>)'
+      pull_tag:
+        description: 'Tag pulled 4testin image (optional: if empty, will be used value from inputs.tag field)(ex. 1.2.3.45)'
        type: string
-        required: true
-        default: '1'
+        required: false

 env:
  COMPANY_NAME: "onlyoffice"
@ -47,12 +46,15 @@ jobs:
        run: |
          set -eux
          VERSION=${{ github.event.inputs.tag }}
-          RELEASE_NUMBER=${{ github.event.inputs.release_number }}
+          PULL_TAG=${{ github.event.inputs.pull_tag }}
          PRODUCT_EDITION=${{ matrix.edition }}
          TESTING_IMAGE=${COMPANY_NAME}/4testing-${PRODUCT_NAME}${PRODUCT_EDITION}
+          if [[ -z "${PULL_TAG}" ]]; then
+               PULL_TAG=${VERSION}
+          fi
+            export PULL_TAG=${PULL_TAG}
            export PRODUCT_EDITION
-            export PULL_TAG=${VERSION}
-            export TAG=${VERSION%.*}.${RELEASE_NUMBER}
+            export TAG=${VERSION}
            export SHORTER_TAG=${VERSION%.*}
            export SHORTEST_TAG=${VERSION%.*.*}
            docker buildx bake -f docker-bake.hcl ${{ matrix.images }} --push
@ -89,11 +91,8 @@ jobs:
      - name: build image
        run: |
          set -eux
-          VERSION=${{ github.event.inputs.tag }}
-          RELEASE_NUMBER=${{ github.event.inputs.release_number }}
-          export PULL_TAG=${VERSION%.*}.${RELEASE_NUMBER}
          export PRODUCT_EDITION=${{ matrix.edition }}
-          export TAG=${VERSION%.*}.${RELEASE_NUMBER}
+          export TAG=${{ github.event.inputs.tag }}
          docker buildx bake -f docker-bake.hcl ${{ matrix.images }} --push
        shell: bash

@ -124,13 +123,17 @@ jobs:
        run: |
           set -eux
           VERSION=${{ github.event.inputs.tag }}
-           RELEASE_NUMBER=${{ github.event.inputs.release_number }}
-           export PRODUCT_EDITION=${{ matrix.edition }}
-           export PACKAGE_BASEURL=${{ secrets.REPO_BASEURL }}
-           export DOCKERFILE=Dockerfile
-           export BASE_IMAGE=ubuntu:20.04
-           export PG_VERSION=12
-           export TAG=${VERSION%.*}.${RELEASE_NUMBER}
-           export PACKAGE_VERSION=$( echo ${VERSION} |  sed -E 's/(.*)\./\1-/')
-           docker buildx bake -f docker-bake.hcl documentserver-ucs --push
+           PULL_TAG=${{ github.event.inputs.pull_tag }}
+           BUILD_TAG=${VERSION}
+           if [[ "${PULL_TAG}" != "" ]]; then
+                BUILD_TAG=${PULL_TAG}
+           fi
+            export PRODUCT_EDITION=${{ matrix.edition }}
+            export PACKAGE_BASEURL=${{ secrets.REPO_BASEURL }}/test
+            export DOCKERFILE=Dockerfile
+            export BASE_IMAGE=ubuntu:20.04
+            export PG_VERSION=12
+            export TAG=${VERSION}
+            export PACKAGE_VERSION=$( echo ${BUILD_TAG} |  sed -E 's/(.*)\./\1-/')~stretch
+            docker buildx bake -f docker-bake.hcl documentserver-ucs --push
        shell: bash
--- a/6
+++ b/6
@ -20,6 +20,7 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
        bomstrip \
        certbot \
        curl \
+        gconf-service \
        htop \
        libasound2 \
        libboost-regex-dev \
@ -65,8 +66,7 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
    service nginx stop && \
    rm -rf /var/lib/apt/lists/*

-COPY config/supervisor/supervisor /etc/init.d/
-COPY config/supervisor/ds/*.conf /etc/supervisor/conf.d/
+COPY config /app/ds/setup/config/
 COPY run-document-server.sh /app/ds/run-document-server.sh

 EXPOSE 80 443
@ -89,8 +89,6 @@ RUN PACKAGE_FILE="${COMPANY_NAME}-${PRODUCT_NAME}${PRODUCT_EDITION}${PACKAGE_VER
    service postgresql start && \
    apt-get -yq install /tmp/$PACKAGE_FILE && \
    service postgresql stop && \
-    chmod 755 /etc/init.d/supervisor && \
-    sed "s/COMPANY_NAME/${COMPANY_NAME}/g" -i /etc/supervisor/conf.d/*.conf && \
    service supervisor stop && \
    chmod 755 /app/ds/*.sh && \
    rm -f /tmp/$PACKAGE_FILE && \
--- a/2
+++ b/2
@ -12,7 +12,7 @@ COMPANY_NAME_ESC = $(subst -,,$(COMPANY_NAME_LOW))

 PACKAGE_NAME := $(COMPANY_NAME_LOW)-$(PRODUCT_NAME)$(PRODUCT_EDITION)
 PACKAGE_VERSION ?= $(PRODUCT_VERSION)-$(BUILD_NUMBER)~stretch
-PACKAGE_BASEURL ?= https://s3.eu-west-1.amazonaws.com/repo-doc-onlyoffice-com/server/linux/debian
+PACKAGE_BASEURL ?= https://s3.eu-west-1.amazonaws.com/repo-doc-onlyoffice-com/server/linux/debian/$(BUILD_CHANNEL)

 ifeq ($(BUILD_CHANNEL),$(filter $(BUILD_CHANNEL),nightly test))
 	DOCKER_TAG := $(PRODUCT_VERSION).$(BUILD_NUMBER)
--- a/README.md
+++ b/README.md
@ -11,7 +11,6 @@
        + [Installation of the SSL Certificates](#installation-of-the-ssl-certificates)
        + [Available Configuration Parameters](#available-configuration-parameters)
 * [Installing ONLYOFFICE Document Server integrated with Community and Mail Servers](#installing-onlyoffice-document-server-integrated-with-community-and-mail-servers)
-* [ONLYOFFICE Document Server ipv6 setup](#onlyoffice-document-server-ipv6-setup)
 * [Issues](#issues)
    - [Docker Issues](#docker-issues)
    - [Document Server usage Issues](#document-server-usage-issues)
@ -26,7 +25,7 @@ Starting from version 6.0, Document Server is distributed as ONLYOFFICE Docs. It

 ONLYOFFICE Docs can be used as a part of ONLYOFFICE Workspace or with third-party sync&share solutions (e.g. Nextcloud, ownCloud, Seafile) to enable collaborative editing within their interface.

-***Important*** Please update `docker-engine` to latest version (`20.10.21` as of writing this doc) before using it. We use `ubuntu:22.04` as base image and it older versions of docker have compatibility problems with it
+***Important*** Please update `docker-enginge` to latest version (`20.10.21` as of writing this doc) before using it. We use `ubuntu:22.04` as base image and it older versions of docker have compatibility problems with it

 ## Functionality ##
 * ONLYOFFICE Document Editor
@ -191,14 +190,12 @@ Below is the complete list of parameters that can be set using environment varia
 - **REDIS_SERVER_PASS**: The Redis server password. The password is not set by default.
 - **NGINX_WORKER_PROCESSES**: Defines the number of nginx worker processes.
 - **NGINX_WORKER_CONNECTIONS**: Sets the maximum number of simultaneous connections that can be opened by a nginx worker process.
- **SECURE_LINK_SECRET**: Defines secret for the nginx config directive [secure_link_md5](https://nginx.org/en/docs/http/ngx_http_secure_link_module.html#secure_link_md5). Defaults to `random string`.
+- **SECURE_LINK_SECRET**: Defines secret for the nginx config directive [secure_link_md5](http://nginx.org/ru/docs/http/ngx_http_secure_link_module.html#secure_link_md5). Defaults to `random string`.
 - **JWT_ENABLED**: Specifies the enabling the JSON Web Token validation by the ONLYOFFICE Document Server. Defaults to `true`.
 - **JWT_SECRET**: Defines the secret key to validate the JSON Web Token in the request to the ONLYOFFICE Document Server. Defaults to random value.
 - **JWT_HEADER**: Defines the http header that will be used to send the JSON Web Token. Defaults to `Authorization`.
 - **JWT_IN_BODY**: Specifies the enabling the token validation in the request body to the ONLYOFFICE Document Server. Defaults to `false`.
 - **WOPI_ENABLED**: Specifies the enabling the wopi handlers. Defaults to `false`.
- **ALLOW_META_IP_ADDRESS**: Defines if it is allowed to connect meta IP address or not. Defaults to `false`.
- **ALLOW_PRIVATE_IP_ADDRESS**: Defines if it is allowed to connect private IP address or not. Defaults to `false`.
 - **USE_UNAUTHORIZED_STORAGE**: Set to `true`if using selfsigned certificates for your storage server e.g. Nextcloud. Defaults to `false`
 - **GENERATE_FONTS**: When 'true' regenerates fonts list and the fonts thumbnails etc. at each start. Defaults to `true`
 - **METRICS_ENABLED**: Specifies the enabling StatsD for ONLYOFFICE Document Server. Defaults to `false`.
@ -321,30 +318,6 @@ wget https://raw.githubusercontent.com/ONLYOFFICE/Docker-CommunityServer/master/
 docker-compose up -d
 ```

-## ONLYOFFICE Document Server ipv6 setup
-
-(Works and is supported only for Linux hosts)
-
-Docker does not currently provide ipv6 addresses to containers by default. This function is experimental now.
-
-To set up interaction via ipv6, you need to enable support for this feature in your Docker. For this you need:
- create the `/etc/docker/daemon.json` file with the following content:
-
-```
-{
-"ipv6": true,
-"fixed-cidr-v6": "2001:db8:abc1::/64"
-}
-```
- restart docker with the following command: `systemctl restart docker`
-
-After that, all running containers receive an ipv6 address and have an inet6 interface.
-
-You can check your default bridge network and see the field there
-`EnableIPv6=true`. A new ipv6 subnet will also be added.
-
-For more information, visit the official [Docker manual site](https://docs.docker.com/config/daemon/ipv6/)
-
 ## Issues

 ### Docker Issues
--- a/config/supervisor/supervisord.conf
+++ b/config/supervisor/supervisord.conf
@ -0,0 +1,31 @@
+; supervisor config file
+
+[inet_http_server]
+port = 127.0.0.1:9001
+username = ds
+password = supervisorpassword
+
+[supervisord]
+logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
+pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
+childlogdir=/var/log/supervisor            ; ('AUTO' child log dir, default $TEMP)
+
+; the below section must remain in the config file for RPC
+; (supervisorctl/web interface) to work, additional interfaces may be
+; added by defining them in separate rpcinterface: sections
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl = http://localhost:9001 ; use a unix:// URL  for a unix socket
+username = ds
+password = supervisorpassword
+
+; The [include] section can just contain the "files" setting.  This
+; setting can list multiple files (separated by whitespace or
+; newlines).  It can also contain wildcards.  The filenames are
+; interpreted as relative to this file.  Included files *cannot*
+; include files themselves.
+
+[include]
+files = /etc/supervisor/conf.d/*.conf
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@ -2,6 +2,10 @@ variable "TAG" {
    default = ""
 }

+variable "PULL_TAG" {
+    default = ""
+}
+
 variable "SHORTER_TAG" {
    default = ""
 }
@ -10,10 +14,6 @@ variable "SHORTEST_TAG" {
    default = ""
 }

-variable "PULL_TAG" {
-    default = ""
-}
-
 variable "COMPANY_NAME" {
    default = ""
 }
@ -54,14 +54,6 @@ variable "BUILD_CHANNEL" {
    default = ""
 }

-variable "PUSH_MAJOR" {
-    default = "false"
-}
-
-variable "LATEST" {
-    default = "false"
-}
-
 ### ↓ Variables for UCS build ↓

 variable "BASE_IMAGE" {
@ -72,14 +64,6 @@ variable "PG_VERSION" {
    default     = ""
 }

-variable "UCS_REBUILD" {
-    default = ""
-}
-
-variable "UCS_PREFIX" {
-    default = ""
-}
-
 ### ↑ Variables for UCS build ↑

 target "documentserver" {
@ -110,6 +94,7 @@ target "documentserver-stable" {
            equal("-ee",PRODUCT_EDITION) ? "docker.io/${COMPANY_NAME}4enterprise/${PREFIX_NAME}${PRODUCT_NAME}${PRODUCT_EDITION}:${TAG}": "",]
    platforms = ["linux/amd64", "linux/arm64"]
    args = {
+        "TAG": "${TAG}"
        "PULL_TAG": "${PULL_TAG}"
        "COMPANY_NAME": "${COMPANY_NAME}"
        "PRODUCT_NAME": "${PRODUCT_NAME}"
@ -141,29 +126,9 @@ target "documentserver-nonexample" {
    tags = [ "docker.io/${COMPANY_NAME}/${PRODUCT_NAME}${PREFIX_NAME}${PRODUCT_EDITION}:${TAG}-nonexample" ]
    platforms = ["linux/amd64", "linux/arm64"]
    args = {
-        "PULL_TAG": "${PULL_TAG}"
+        "TAG": "${TAG}"
        "COMPANY_NAME": "${COMPANY_NAME}"
        "PRODUCT_NAME": "${PRODUCT_NAME}"
        "PRODUCT_EDITION": "${PRODUCT_EDITION}"
    } 
 }
-
-target "documentserver-stable-rebuild" {
-    target = "documentserver-stable-rebuild"
-    dockerfile = "production.dockerfile"
-    tags = equal("true",UCS_REBUILD) ? ["docker.io/${COMPANY_NAME}/${PREFIX_NAME}${PRODUCT_NAME}${PRODUCT_EDITION}-ucs:${TAG}",] : [
-                                        "docker.io/${COMPANY_NAME}/${PREFIX_NAME}${PRODUCT_NAME}${PRODUCT_EDITION}:${TAG}",
-                equal("",PREFIX_NAME) ? "docker.io/${COMPANY_NAME}/${PREFIX_NAME}${PRODUCT_NAME}${PRODUCT_EDITION}:${SHORTER_TAG}": "",
-             equal("true",PUSH_MAJOR) ? "docker.io/${COMPANY_NAME}/${PREFIX_NAME}${PRODUCT_NAME}${PRODUCT_EDITION}:${SHORTEST_TAG}": "",
-                equal("",PREFIX_NAME) && equal("true",LATEST) ? "docker.io/${COMPANY_NAME}/${PREFIX_NAME}${PRODUCT_NAME}${PRODUCT_EDITION}:latest": "",
-         equal("-ee",PRODUCT_EDITION) && equal("",PREFIX_NAME) ? "docker.io/${COMPANY_NAME}4enterprise/${PREFIX_NAME}${PRODUCT_NAME}${PRODUCT_EDITION}:${TAG}": "",
-                                 ]
-    platforms = ["linux/amd64", "linux/arm64"]
-    args = {
-        "UCS_PREFIX": "${UCS_PREFIX}"
-        "PULL_TAG": "${PULL_TAG}"
-        "COMPANY_NAME": "${COMPANY_NAME}"
-        "PRODUCT_NAME": "${PRODUCT_NAME}"
-        "PRODUCT_EDITION": "${PRODUCT_EDITION}"
-    }
-}
--- a/production.dockerfile
+++ b/production.dockerfile
@ -2,20 +2,11 @@
 ARG PULL_TAG=latest
 ARG COMPANY_NAME=onlyoffice
 ARG PRODUCT_EDITION=
-### Rebuild arguments
-ARG UCS_PREFIX=
-ARG IMAGE=${COMPANY_NAME}/documentserver${PRODUCT_EDITION}${UCS_PREFIX}:${PULL_TAG}

 ### Build main-release ###

 FROM ${COMPANY_NAME}/4testing-documentserver${PRODUCT_EDITION}:${PULL_TAG} as documentserver-stable

-### Rebuild stable images with secure updates 
-FROM ${IMAGE} as documentserver-stable-rebuild
-RUN    echo "This is rebuild" \
-    && apt-get update -y \
-    && apt-get upgrade -y
-
 ### Build nonexample ###
 
 FROM ${COMPANY_NAME}/documentserver${PRODUCT_EDITION}:${PULL_TAG} as documentserver-nonexample
--- a/run-document-server.sh
+++ b/run-document-server.sh
@ -92,8 +92,6 @@ JWT_HEADER=${JWT_HEADER:-Authorization}
 JWT_IN_BODY=${JWT_IN_BODY:-false}

 WOPI_ENABLED=${WOPI_ENABLED:-false}
-ALLOW_META_IP_ADDRESS=${ALLOW_META_IP_ADDRESS:-false}
-ALLOW_PRIVATE_IP_ADDRESS=${ALLOW_PRIVATE_IP_ADDRESS:-false}

 GENERATE_FONTS=${GENERATE_FONTS:-true}

@ -346,12 +344,6 @@ update_ds_settings(){
    ${JSON} -I -e "if(this.wopi===undefined)this.wopi={}"
    ${JSON} -I -e "this.wopi.enable = true"
  fi
-
-  if [ "${ALLOW_META_IP_ADDRESS}" = "true" ] || [ "${ALLOW_PRIVATE_IP_ADDRESS}" = "true" ]; then
-    ${JSON} -I -e "if(this.services.CoAuthoring['request-filtering-agent']===undefined)this.services.CoAuthoring['request-filtering-agent']={}"
-    [ "${ALLOW_META_IP_ADDRESS}" = "true" ] && ${JSON} -I -e "this.services.CoAuthoring['request-filtering-agent'].allowMetaIPAddress = true"
-    [ "${ALLOW_PRIVATE_IP_ADDRESS}" = "true" ] && ${JSON} -I -e "this.services.CoAuthoring['request-filtering-agent'].allowPrivateIPAddress = true"
-  fi
 }

 create_postgresql_cluster(){
@ -499,6 +491,16 @@ update_nginx_settings(){
  documentserver-update-securelink.sh -s ${SECURE_LINK_SECRET:-$(pwgen -s 20)} -r false
 }

+update_supervisor_settings(){
+  # Copy modified supervisor start script
+  cp ${SYSCONF_TEMPLATES_DIR}/supervisor/supervisor /etc/init.d/
+  # Copy modified supervisor config
+  cp ${SYSCONF_TEMPLATES_DIR}/supervisor/supervisord.conf /etc/supervisor/supervisord.conf
+  sed "s_\(password =\).*_\1 $(pwgen -s 20)_" -i /etc/supervisor/supervisord.conf
+  sed "s/COMPANY_NAME/${COMPANY_NAME}/g" -i ${SYSCONF_TEMPLATES_DIR}/supervisor/ds/*.conf
+  cp ${SYSCONF_TEMPLATES_DIR}/supervisor/ds/*.conf /etc/supervisor/conf.d/
+}
+
 update_log_settings(){
   ${JSON_LOG} -I -e "this.categories.default.level = '${DS_LOG_LEVEL}'"
 }
@ -599,7 +601,7 @@ else
  update_welcome_page
 fi

-find /etc/${COMPANY_NAME} ! -path '*logrotate*' -exec chown ds:ds {} \;
+find /etc/${COMPANY_NAME} -exec chown ds:ds {} \;

 #start needed local services
 for i in ${LOCAL_SERVICES[@]}; do
@ -624,7 +626,8 @@ if [ ${ONLYOFFICE_DATA_CONTAINER} != "true" ]; then
  fi

  update_nginx_settings
-  
+
+  update_supervisor_settings
  service supervisor start
  
  # start cron to enable log rotating