From c017ed168090564fb90672e535159b00e7f83eab Mon Sep 17 00:00:00 2001
From: Danil Titarenko <77471369+danilapog@users.noreply.github.com>
Date: Tue, 31 Jan 2023 15:18:39 +0300
Subject: [PATCH 1/4] Fix stable build (#573)

Remove image present checker, because its not work corractly
---
 .github/workflows/stable-build.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/stable-build.yml b/.github/workflows/stable-build.yml
index 26eff41..f9ccdb7 100644
--- a/.github/workflows/stable-build.yml
+++ b/.github/workflows/stable-build.yml
@@ -44,8 +44,6 @@ jobs:
           VERSION=${{ github.event.inputs.tag }}
           PRODUCT_EDITION=${{ matrix.edition }}
           TESTING_IMAGE=${COMPANY_NAME}/4testing-${PRODUCT_NAME}${PRODUCT_EDITION}
-          if docker manifest inspect ${TESTING_IMAGE}:${VERSION} > /dev/null; then
-            echo "Image present on docker.hub >> start build stable version"
             export PRODUCT_EDITION
             export TAG=${VERSION}
             export SHORTER_TAG=${VERSION%.*}
@@ -53,10 +51,6 @@ jobs:
             docker buildx bake -f docker-bake.hcl ${{ matrix.images }} --push
             echo "DONE: Build success >> exit with 0"
             exit 0
-          else
-            echo "FAILED: Image with tag ${VERSION} do not presented on docker.hub >> build will not started >> exit with 1"
-            exit 1
-          fi
         shell: bash
 
   build-nonexample:

From f98d6a4ae3f0ef9bc8b8c46d60a27989857f69b4 Mon Sep 17 00:00:00 2001
From: Danil Titarenko <77471369+danilapog@users.noreply.github.com>
Date: Tue, 31 Jan 2023 17:05:26 +0300
Subject: [PATCH 2/4] Fix ucs build (#574)

Links on packages was update
---
 .github/workflows/stable-build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/stable-build.yml b/.github/workflows/stable-build.yml
index f9ccdb7..d0cc970 100644
--- a/.github/workflows/stable-build.yml
+++ b/.github/workflows/stable-build.yml
@@ -114,11 +114,11 @@ jobs:
         run: |
            set -eux
            export PRODUCT_EDITION=${{ matrix.edition }}
-           export PACKAGE_BASEURL=${{ secrets.REPO_BASEURL_OLD }}/testing/ubuntu
+           export PACKAGE_BASEURL=${{ secrets.REPO_BASEURL }}/test
            export DOCKERFILE=Dockerfile
            export BASE_IMAGE=ubuntu:20.04
            export PG_VERSION=12
            export TAG=${{ github.event.inputs.tag }}
-           export PACKAGE_VERSION=$( echo ${TAG} |  sed -E 's/(.*)\./\1-/')
+           export PACKAGE_VERSION=$( echo ${TAG} |  sed -E 's/(.*)\./\1-/')~stretch
            docker buildx bake -f docker-bake.hcl documentserver-ucs --push
         shell: bash

From a3d7ed7ceb2a1f94ea4e86d35cd2bddd61d12847 Mon Sep 17 00:00:00 2001
From: Danil Titarenko <77471369+danilapog@users.noreply.github.com>
Date: Thu, 2 Feb 2023 18:41:49 +0300
Subject: [PATCH 3/4] Install rabbitmq-server from default ubuntu repo, fixed
 bug closes #575 (#578)

(cherry picked from commit cac79dea01b64793909ed505d28c9cc5667aac9b)
---
 Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a0e2156..8bba423 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,8 +17,6 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
     chmod 644 /etc/apt/trusted.gpg.d/onlyoffice.gpg && \
     locale-gen en_US.UTF-8 && \
     echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections && \
-    wget -O - https://packagecloud.io/install/repositories/rabbitmq/rabbitmq-server/script.deb.sh | bash && \
-    if [ $(lsb_release -cs) = focal ]; then RABBITMQ_VERSION=3.8.11-1; else RABBITMQ_VERSION=3.9 ; fi && \
     apt-get -yq install \
         adduser \
         apt-utils \
@@ -47,7 +45,7 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
         postgresql \
         postgresql-client \
         pwgen \
-        rabbitmq-server=${RABBITMQ_VERSION}* \
+        rabbitmq-server \
         redis-server \
         software-properties-common \
         sudo \

From 934d17b994c739d0b418db6212d05426933f0462 Mon Sep 17 00:00:00 2001
From: Alexey Golubev <alexey.golubev@onlyoffice.com>
Date: Tue, 7 Feb 2023 13:00:29 +0500
Subject: [PATCH 4/4] Fix bug #61002 (#583)

Removed unused code that was causing a build error
---
 Dockerfile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8bba423..b798712 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,9 +12,6 @@ ARG ONLYOFFICE_VALUE=onlyoffice
 RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
     apt-get -y update && \
     apt-get -yq install wget apt-transport-https gnupg locales lsb-release && \
-    mkdir -p $HOME/.gnupg && \
-    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/onlyoffice.gpg --keyserver keyserver.ubuntu.com --recv-keys 0x8320ca65cb2de8e5 && \
-    chmod 644 /etc/apt/trusted.gpg.d/onlyoffice.gpg && \
     locale-gen en_US.UTF-8 && \
     echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections && \
     apt-get -yq install \