Skip to content

Commit ce0e4f2

Browse files
committed
export PATH and LD_LIBRARY_PATH in examples is no more needed
1 parent 1a5f5d1 commit ce0e4f2

File tree

5 files changed

+11
-17
lines changed

5 files changed

+11
-17
lines changed

5.26/README.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,8 @@ FROM rhscl/perl-526-rhel7
102102
ADD app-src .
103103
104104
# Install the dependencies
105-
RUN export PATH=${PATH}:/opt/rh/rh-perl526/root/usr/bin/&& \
106-
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/rh/rh-perl526/root/usr/lib64 && \
107-
cpanm --notest -l extlib Module::CoreList && \
108-
cpanm --notest -l extlib --installdeps .
105+
RUN cpanm --notest -l extlib Module::CoreList && \
106+
cpanm --notest -l extlib --installdeps .
109107
110108
# Set up web application
111109
CMD sed -i '1i<Location/>' /opt/app-root/etc/httpd.d/40-psgi.conf

5.30/Dockerfile.fedora

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ Perl is a high-level programming language with roots in C, sed, awk and shell sc
1616
Perl is good at handling processes and files, and is especially good at handling text. \
1717
Perl's hallmarks are practicality and efficiency. While it is used to do a lot of \
1818
different things, Perl's most common applications are system administration utilities \
19-
and web programming."
19+
and web programming." \
20+
PATH=$PATH:/opt/app-root/src/extlib/bin \
21+
PERL5LIB=/opt/app-root/src/extlib/lib/perl5
2022

2123
LABEL summary="$SUMMARY" \
2224
description="$DESCRIPTION" \

5.30/README.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,8 @@ FROM quay.io/centos7/perl-530-centos7
102102
ADD app-src .
103103
104104
# Install the dependencies
105-
RUN export PATH=${PATH}:/opt/rh/rh-perl530/root/usr/bin/&& \
106-
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/rh/rh-perl530/root/usr/lib64 && \
107-
cpanm --notest -l extlib Module::CoreList && \
108-
cpanm --notest -l extlib --installdeps .
105+
RUN cpanm --notest -l extlib Module::CoreList && \
106+
cpanm --notest -l extlib --installdeps .
109107
110108
CMD sed -i '1i<Location/>' /opt/app-root/etc/httpd.d/40-psgi.conf
111109
CMD sed -i '2iSetHandler perl-script' /opt/app-root/etc/httpd.d/40-psgi.conf

examples/from-dockerfile/5.26/Dockerfile

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
FROM centos/perl-526-centos7
1+
FROM quay.io/centos7/perl-526-centos7
22

33
# Add application sources
44
ADD app-src \.
55

66

77
# Install dependencies cpanfile required
8-
RUN export PATH=${PATH}:/opt/rh/rh-perl526/root/usr/bin/&& \
9-
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/rh/rh-perl526/root/usr/lib64 && \
10-
cpanm --notest -l extlib Module::CoreList && \
8+
RUN cpanm --notest -l extlib Module::CoreList && \
119
cpanm --notest -l extlib --installdeps .
1210

1311
CMD sed -i '1i<Location/>' /opt/app-root/etc/httpd.d/40-psgi.conf

examples/from-dockerfile/5.30/Dockerfile

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
FROM centos/perl-530-centos7
1+
FROM quay.io/centos7/perl-530-centos7
22

33
# Add application sources
44
ADD app-src \.
55

66

77
# Install dependencies cpanfile required
8-
RUN export PATH=${PATH}:/opt/rh/rh-perl530/root/usr/bin/&& \
9-
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/rh/rh-perl530/root/usr/lib64 && \
10-
cpanm --notest -l extlib Module::CoreList && \
8+
RUN cpanm --notest -l extlib Module::CoreList && \
119
cpanm --notest -l extlib --installdeps .
1210

1311
CMD sed -i '1i<Location/>' /opt/app-root/etc/httpd.d/40-psgi.conf

0 commit comments

Comments
 (0)