diff --git a/.github/workflows/stable-build.yml b/.github/workflows/stable-build.yml index ab5813c..fea89d2 100644 --- a/.github/workflows/stable-build.yml +++ b/.github/workflows/stable-build.yml @@ -131,6 +131,7 @@ jobs: export DOCKERFILE=Dockerfile export BASE_VERSION=20.04 export PG_VERSION=12 + export PACKAGE_SUFFIX= export TAG=${VERSION%.*}.${RELEASE_NUMBER} export PACKAGE_VERSION=$( echo ${VERSION} | sed -E 's/(.*)\./\1-/') docker buildx bake -f docker-bake.hcl documentserver-ucs --push diff --git a/Dockerfile b/Dockerfile index f8d28f3..b3df91e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_VERSION=22.04 +ARG BASE_VERSION=24.04 ARG BASE_IMAGE=ubuntu:$BASE_VERSION @@ -6,7 +6,8 @@ FROM ${BASE_IMAGE} AS documentserver LABEL maintainer Ascensio System SIA ARG BASE_VERSION -ARG PG_VERSION=14 +ARG PG_VERSION=16 +ARG PACKAGE_SUFFIX=t64 ENV OC_RELEASE_NUM=21 ENV OC_RU_VER=12 @@ -26,7 +27,9 @@ 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 && \ wget -q -O /etc/apt/sources.list.d/mssql-release.list https://packages.microsoft.com/config/ubuntu/$BASE_VERSION/prod.list && \ - wget -q -O - https://packages.microsoft.com/keys/microsoft.asc | apt-key add - && \ + wget -q -O /tmp/microsoft.asc https://packages.microsoft.com/keys/microsoft.asc && \ + apt-key add /tmp/microsoft.asc && \ + gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg < /tmp/microsoft.asc && \ apt-get -y update && \ locale-gen en_US.UTF-8 && \ echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections && \ @@ -38,8 +41,8 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \ cron \ curl \ htop \ - libaio1 \ - libasound2 \ + libaio1${PACKAGE_SUFFIX} \ + libasound2${PACKAGE_SUFFIX} \ libboost-regex-dev \ libcairo2 \ libcurl3-gnutls \