UNCLASSIFIED

Skip to content

GitLab

Commit ad0d8a77 authored by Al Fontaine's avatar Al Fontaine
Browse files

Merge branch 'perl' into 'development' 

fixed perl yum conflict

See merge request !14
parents 545d3481 9b760ce7
Pipeline #335587 passed with stages
in 30 minutes and 40 seconds
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
Dockerfile
View file @ ad0d8a77
...@@ -13,14 +13,14 @@ COPY --from=multi-stage /opt/python /opt/python ...@@ -13,14 +13,14 @@ COPY --from=multi-stage /opt/python /opt/python
ENV PATH="/opt/python/venv/bin:$PATH" ENV PATH="/opt/python/venv/bin:$PATH"
USER root USER root
#Workaround for perl issue preventing yum upgrade
RUN yum remove -y perl-threads
RUN yum upgrade -y \ RUN yum upgrade -y \
&& yum clean all -y \ && yum clean all -y \
&& yum install -y \ && yum install -y \
vim \ vim \
zip \ zip \
unzip \ unzip \
wget \
net-tools \ net-tools \
# gcc is needed for prophet # gcc is needed for prophet
gcc-c++ \ gcc-c++ \
...@@ -61,6 +61,7 @@ RUN rm -rf /usr/share/doc/perl-IO-Socket-SSL/certs/ \ ...@@ -61,6 +61,7 @@ RUN rm -rf /usr/share/doc/perl-IO-Socket-SSL/certs/ \
&& rm -rf /usr/share/doc/perl-IO-Socket-SSL/example/ \ && rm -rf /usr/share/doc/perl-IO-Socket-SSL/example/ \
&& rm -rf /usr/share/doc/perl-IO-Socket-SSL/example/ \ && rm -rf /usr/share/doc/perl-IO-Socket-SSL/example/ \
&& rm -rf /usr/share/doc/perl-Net-SSLeay/examples/server_key.pem \ && rm -rf /usr/share/doc/perl-Net-SSLeay/examples/server_key.pem \
&& rm -rf /opt/python/venv/lib/python3.8/site-packages/tornado/test/test.key \
&& chmod g-s /usr/libexec/openssh/ssh-keysign && chmod g-s /usr/libexec/openssh/ssh-keysign
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

UNCLASSIFIED