zrhoffman commented on a change in pull request #5209:
URL: https://github.com/apache/trafficcontrol/pull/5209#discussion_r577995677
##########
File path: infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
##########
@@ -20,129 +20,76 @@
# Based on CentOS 8
############################################################
-# Keep the trafficops-common-deps in Dockerfile the same as
-# trafficops-common-deps in Dockerfile-go to cache the same
-# layer.
ARG RHEL_VERSION=8
-FROM centos:${RHEL_VERSION} as trafficops-common-deps
+FROM centos:${RHEL_VERSION}
ARG RHEL_VERSION=8
# Makes RHEL_VERSION available in later layers without needing to specify it
again
ENV RHEL_VERSION=$RHEL_VERSION
RUN if [[ "${RHEL_VERSION%%.*}" -eq 7 ]]; then \
- yum -y install dnf || exit 1; \
- fi
+ yum -y install dnf || exit 1; \
+ fi
RUN set -o nounset -o errexit && \
- mkdir -p /etc/cron.d; \
- if [[ "${RHEL_VERSION%%.*}" -eq 7 ]]; then \
- use_repo=''; \
- else \
- use_repo='--repo=pgdg96'; \
- 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 $use_repo -- install postgresql96; \
- dnf -y install epel-release; \
- dnf -y install \
- jq \
- bind-utils \
- net-tools \
- gettext \
- perl-JSON-PP \
- mkisofs \
- isomd5sum \
- nmap-ncat \
- openssl \
- # Used to copy certs in "Shared SSL certificate generation" step
- rsync; \
- dnf clean all
-
-FROM trafficops-common-deps as trafficops-perl-deps
+ mkdir -p /etc/cron.d; \
+ if [[ "${RHEL_VERSION%%.*}" -eq 7 ]]; then \
+ use_repo=''; \
+ else \
+ use_repo='--repo=pgdg96'; \
+ 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 $use_repo -- install postgresql96; \
+ dnf -y install epel-release; \
+ dnf -y install \
+ jq \
+ bind-utils \
+ net-tools \
+ gettext \
+ perl-JSON-PP \
+ perl-Crypt-ScryptKDF \
Review comment:
> Should we look into removing the perl scripts as a separate issue in
the future?
For sure. All of the Perl cryptography functions it uses are reimplemented
in Go and used by traffic_ops_golang, so we should have everything we need to
rewrite it.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
