From 7fa2f598a19a56d06b234c46f94748a81b7e4313 Mon Sep 17 00:00:00 2001 From: Danil Titarenko <77471369+danilapog@users.noreply.github.com> Date: Tue, 20 Dec 2022 14:54:23 +0300 Subject: [PATCH] Fix ucs build (#537) * Fix ucs build * Change rabbitmq version on lower * Remove rabbimq version argument * Rename variable --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 55e4b6e..eeab60d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,13 +11,14 @@ 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 && \ + 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 && \ 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.10 ; fi && \ apt-get -yq install \ adduser \ apt-utils \ @@ -46,7 +47,7 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \ postgresql \ postgresql-client \ pwgen \ - rabbitmq-server=3.10* \ + rabbitmq-server=${RABBITMQ_VERSION}* \ redis-server \ software-properties-common \ sudo \