Skip to content

Commit 91d2b42

Browse files
committed
Remove SCL part, Use gettext-envsubst and nss_wrapper-libs
Signed-off-by: Petr "Stone" Hracek <[email protected]>
1 parent 06e6ee2 commit 91d2b42

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

src/Dockerfile

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,10 @@ COPY root/usr/libexec/fix-permissions /usr/libexec/fix-permissions
5656
{{ spec.repo_enable_reason }}
5757
{% endif %}
5858
{% if spec.prod == "c10s" %}
59-
RUN INSTALL_PKGS="rsync tar gettext bind-utils nss_wrapper {{ spec.pkgs }}" && \
59+
RUN INSTALL_PKGS="rsync tar gettext-envsubst bind-utils nss_wrapper-libs {{ spec.pkgs }}" && \
6060
{% else %}
6161
RUN {{ spec.environment_setup }}
62-
{% if spec.has_devel_repo %}
63-
{% if config.os.id == 'rhel' %}
64-
{% if spec.has_devel_repo.rhel == 'brew' %}
65-
yum-config-manager --add-repo http://download.devel.redhat.com/brewroot/repos/rhscl-{{ spec.rhscl_version.development }}-rh-postgresql{{ spec.version }}-rhel-7-build/latest/x86_64 && \
66-
echo gpgcheck=0 >> /etc/yum.repos.d/download.devel.redhat.com_brewroot_repos_rhscl-{{ spec.rhscl_version.development }}-rh-postgresql{{ spec.version }}-rhel-7-build_latest_x86_64.repo && \
67-
{% elif spec.has_devel_repo.rhel == 'beta' %}
68-
yum-config-manager --enable rhel-server-rhscl-7-beta-rpms && \
69-
{% endif %}
70-
{% endif %}
71-
{% endif %}
72-
INSTALL_PKGS="rsync tar gettext bind-utils nss_wrapper {{ spec.pkgs }}" && \
62+
INSTALL_PKGS="rsync tar gettext bind-utils nss_wrapper-libs {{ spec.pkgs }}" && \
7363
{% endif %}
7464
{% if spec.version not in ["9.6", "10", "11"] %}
7565
INSTALL_PKGS="$INSTALL_PKGS pgaudit" && \

0 commit comments

Comments
 (0)