Update base image to 24.04 (#13)
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/Docker-DocumentServer/pulls/13 Reviewed-by: Alexey Golubev <Alexey.Golubev@onlyoffice.com> Co-authored-by: Nasrullo Nurullaev <nasrullo.nurullaev@onlyoffice.com> Co-committed-by: Nasrullo Nurullaev <nasrullo.nurullaev@onlyoffice.com>
This commit is contained in:
parent
19c2c0bf7d
commit
2e4c0e7ebc
2 changed files with 9 additions and 5 deletions
1
.github/workflows/stable-build.yml
vendored
1
.github/workflows/stable-build.yml
vendored
|
|
@ -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
|
||||
|
|
|
|||
13
Dockerfile
13
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 <support@onlyoffice.com>
|
||||
|
||||
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 \
|
||||
|
|
|
|||
Loading…
Reference in a new issue