From dc43a8135dd8d89e85a5b7da1f5adc1217f46927 Mon Sep 17 00:00:00 2001 From: osadan Date: Thu, 13 May 2021 14:47:47 +0300 Subject: [PATCH] simple test --- Dockerfile-debian.template | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 876229be59..75e7ac8a92 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -53,8 +53,8 @@ RUN set -eux; \ ! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \ fi; \ apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \ - localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 -ENV LANG en_US.utf8 + localedef -i ru_RU -c -f UTF-8 -A /usr/share/locale/locale.alias ru_RU.UTF-8 +ENV LANG ru_RU.utf8 RUN set -eux; \ apt-get update; \ @@ -94,6 +94,9 @@ RUN set -ex; \ case "$dpkgArch" in \ %%ARCH_LIST%%) \ # arches officialy built by upstream +# add postgrespro 1C repo + echo "deb http://repo.postgrespro.ru/pg1c-$PG_MAJOR/debian/ %%DEBIAN_SUITE%% main" > /etc/apt/sources.list.d/pgpro1c.list; \ + wget -qO "http://repo.postgrespro.ru/pg1c-$PG_MAJOR/keys/GPG-KEY-POSTGRESPRO" | apt-key add - \ echo "deb http://apt.postgresql.org/pub/repos/apt/ %%DEBIAN_SUITE%%-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \ apt-get update; \ ;; \ @@ -126,8 +129,8 @@ RUN set -ex; \ ; \ DEB_BUILD_OPTIONS="nocheck parallel=$(nproc)" \ apt-get source --compile \ - postgresql-common pgdg-keyring \ - "postgresql-$PG_MAJOR=$PG_VERSION" \ + postgresql-common-pro-1c pgdg-keyring \ + "postgresql-pro-1c-$PG_MAJOR=$PG_VERSION" \ ; \ # we don't remove APT lists here because they get re-downloaded and removed later \ @@ -149,11 +152,11 @@ RUN set -ex; \ ;; \ esac; \ \ - apt-get install -y --no-install-recommends postgresql-common; \ + apt-get install -y --no-install-recommends postgresql-common-pro-1c; \ sed -ri 's/#(create_main_cluster) .*$/\1 = false/' /etc/postgresql-common/createcluster.conf; \ apt-get install -y --no-install-recommends \ - "postgresql-$PG_MAJOR=$PG_VERSION" \ - "postgresql-contrib-$PG_MAJOR=$PG_VERSION" \ + "postgresql-pro-1c-$PG_MAJOR=$PG_VERSION" \ + "postgresql-contrib-pro-1c-$PG_MAJOR=$PG_VERSION" \ ; \ \ rm -rf /var/lib/apt/lists/*; \