diff --git a/.github/workflows/stable-build.yml b/.github/workflows/stable-build.yml index fd493f3..ab5813c 100644 --- a/.github/workflows/stable-build.yml +++ b/.github/workflows/stable-build.yml @@ -129,7 +129,7 @@ jobs: export PRODUCT_EDITION=${{ matrix.edition }} export PACKAGE_BASEURL=${{ secrets.REPO_BASEURL }} export DOCKERFILE=Dockerfile - export BASE_IMAGE=ubuntu:20.04 + export BASE_VERSION=20.04 export PG_VERSION=12 export TAG=${VERSION%.*}.${RELEASE_NUMBER} export PACKAGE_VERSION=$( echo ${VERSION} | sed -E 's/(.*)\./\1-/') diff --git a/Dockerfile b/Dockerfile index 0b4720d..a826476 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,21 @@ -ARG BASE_IMAGE=ubuntu:22.04 +ARG BASE_VERSION=22.04 + +ARG BASE_IMAGE=ubuntu:$BASE_VERSION FROM ${BASE_IMAGE} as documentserver LABEL maintainer Ascensio System SIA +ARG BASE_VERSION ARG PG_VERSION=14 -ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive PG_VERSION=${PG_VERSION} +ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive PG_VERSION=${PG_VERSION} BASE_VERSION=${BASE_VERSION} 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 && \ - wget -q -O /etc/apt/sources.list.d/mssql-release.list https://packages.microsoft.com/config/ubuntu/22.04/prod.list && \ + 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 - && \ apt-get -y update && \ locale-gen en_US.UTF-8 && \ diff --git a/docker-bake.hcl b/docker-bake.hcl index 54de0b6..793d568 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -64,7 +64,7 @@ variable "LATEST" { ### ↓ Variables for UCS build ↓ -variable "BASE_IMAGE" { +variable "BASE_VERSION" { default = "" } @@ -130,7 +130,7 @@ target "documentserver-ucs" { "COMPANY_NAME": "${COMPANY_NAME}" "PACKAGE_VERSION": "${PACKAGE_VERSION}" "PACKAGE_BASEURL": "${PACKAGE_BASEURL}" - "BASE_IMAGE": "${BASE_IMAGE}" + "BASE_VERSION": "${BASE_VERSION}" "PG_VERSION": "${PG_VERSION}" } }