This is an automated email from the ASF dual-hosted git repository.
ocket8888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new dbe846a174 CiaB: Disable PostgreSQL 12 repo (#7541)
dbe846a174 is described below
commit dbe846a1745ae50c225f072e667b80969e1022e1
Author: Zach Hoffman <[email protected]>
AuthorDate: Wed May 24 19:20:17 2023 -0600
CiaB: Disable PostgreSQL 12 repo (#7541)
* Disable PostgreSQL 12 repo
* Reorder installs to make disable_repo unnecessary
---
infrastructure/cdn-in-a-box/traffic_ops/Dockerfile | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
index 6427f70e86..b5d8147dc1 100644
--- a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
+++ b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
@@ -34,7 +34,7 @@ RUN if [[ "${RHEL_VERSION%%.*}" -eq 7 ]]; then \
yum -y install dnf || exit 1; \
fi
-RUN set -o nounset -o errexit && \
+RUN set -o nounset -o errexit -o xtrace && \
mkdir -p /etc/cron.d; \
if [[ "${RHEL_VERSION%%.*}" -eq 7 ]]; then \
use_repo=''; \
@@ -43,9 +43,12 @@ RUN set -o nounset -o errexit && \
use_repo='--repo=pgdg13'; \
enable_repo='--enablerepo=powertools'; \
fi; \
- dnf -y install
"https://download.postgresql.org/pub/repos/yum/reporpms/EL-${RHEL_VERSION%%.*}-$(rpm
--eval %_arch)/pgdg-redhat-repo-latest.noarch.rpm"; \
dnf -y install epel-release libicu; \
+ dnf -y install
"https://download.postgresql.org/pub/repos/yum/reporpms/EL-${RHEL_VERSION%%.*}-$(rpm
--eval %_arch)/pgdg-redhat-repo-latest.noarch.rpm"; \
dnf -y $use_repo -- install postgresql13; \
+ if [[ -n "$enable_repo" ]]; then \
+ dnf -y remove pgdg-redhat-repo; \
+ fi; \
dnf -y $enable_repo install \
bind-utils \
# find is required by to-access.sh
