This is an automated email from the ASF dual-hosted git repository. zrhoffman pushed a commit to branch 6.1.x in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit acb60c34ad960af0f5f028aa49ff2b136307d05e Author: ocket8888 <[email protected]> AuthorDate: Wed Jan 19 09:36:00 2022 -0700 Remove now-unnecessary libraries from CDN-in-a-Box's Traffic Ops image (#6460) (cherry picked from commit 2eec1ae16fdf6e97d925cb6ea381af773cda5ef5) --- infrastructure/cdn-in-a-box/traffic_ops/Dockerfile | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile index d58c916..342d9d8 100644 --- a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile +++ b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile @@ -37,22 +37,13 @@ RUN set -o nounset -o errexit && \ if [[ "${RHEL_VERSION%%.*}" -eq 7 ]]; then \ use_repo=''; \ enable_repo=''; \ - llvm_version=5.0; \ - # needed for llvm-toolset-7-clang, which is needed for postgresql13-devel-13.2-1PGDG, required by TO rpm - dnf -y install gcc centos-release-scl-rh; \ else \ use_repo='--repo=pgdg13'; \ enable_repo='--enablerepo=powertools'; \ - llvm_version=''; \ fi; \ dnf -y install "https://download.postgresql.org/pub/repos/yum/reporpms/EL-${RHEL_VERSION%%.*}-x86_64/pgdg-redhat-repo-latest.noarch.rpm";; \ - dnf -y install epel-release; \ - dnf -y install \ - # libicu is required by postgresql13 - libicu \ - # libicu-devel, clang-devel, and llvm-devel are required by postgresql13-devel - libicu-devel clang-devel llvm${llvm_version}-devel; \ - dnf -y $use_repo -- install postgresql13 postgresql13-devel; \ + dnf -y install epel-release libicu; \ + dnf -y $use_repo -- install postgresql13; \ dnf -y $enable_repo install \ bind-utils \ gettext \
