Skip to content

Commit 37abf99

Browse files
thxCodethxCode
committed
refactor: adjust openssl install
Signed-off-by: thxCode <[email protected]>
1 parent 4240c49 commit 37abf99

File tree

8 files changed

+28
-74
lines changed

8 files changed

+28
-74
lines changed

‎cann/openeuler/Dockerfile.suffix

+3-9
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,13 @@ RUN yum install -y gcc gcc-c++ gcc-toolset-10-gcc* \
2626
RUN yum install -y gcc-toolset-10-libstdc++-static
2727

2828
# OPENSSL
29-
ENV OPENSSL_VESION=3.4.0 \
30-
PKG_CONFIG_PATH="/usr/local/openssl/lib/pkgconfig:/usr/local/openssl/lib64/pkgconfig:$PKG_CONFIG_PATH" \
31-
LD_LIBRARY_PATH="/usr/local/openssl/lib:/usr/local/openssl/lib64:$LD_LIBRARY_PATH"
29+
ENV OPENSSL_VESION=3.4.0
3230
RUN yum install -y zlib-devel perl perl-IPC-Cmd perl-Test-Simple perl-CPAN \
3331
&& curl -sL "https://github.com/openssl/openssl/releases/download/openssl-${OPENSSL_VESION}/openssl-${OPENSSL_VESION}.tar.gz" | tar -zx -C /tmp \
3432
&& loc=$(pwd) && cd /tmp/openssl-${OPENSSL_VESION} \
35-
&& ./config --prefix=/usr/local/openssl --openssldir=/etc/ssl shared enable-ssl3 enable-ssl3-method enable-mdc2 enable-md2 \
33+
&& ./config --prefix=/usr --bindir=/usr/bin --datadir=/usr/share/openssl --docdir=/usr/share/doc/openssl --incdir=/usr/include/openssl --libdir=/usr/lib64 --shlidir=/usr/lib64 --openssldir=/etc/ssl --enable-shared --enable-ssl3 --enable-ssl3-method --enable-mdc2 --enable-md2 \
3634
&& make -j $(nproc) build_sw && make -j $(nproc) install_sw \
37-
&& cd ${local} && rm -rf /tmp/openssl-${OPENSSL_VESION} \
38-
&& ln -vsf /usr/local/openssl/bin/* /usr/bin/ \
39-
&& ln -vsf /usr/local/openssl/include/openssl /usr/include/openssl \
40-
&& echo "/usr/local/openssl/lib" >> /etc/ld.so.conf \
41-
&& echo "/usr/local/openssl/lib64" >> /etc/ld.so.conf \
35+
&& cd ${loc} && rm -rf /tmp/openssl-${OPENSSL_VESION} \
4236
&& ldconfig -v \
4337
&& openssl --version
4438

‎cann/ubuntu/Dockerfile.suffix

+3-9
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,13 @@ RUN apt-get install -y binutils pkg-config gcc-11 g++-11 \
2626
RUN apt-get install -y build-essential
2727

2828
# OPENSSL
29-
ENV OPENSSL_VESION=3.4.0 \
30-
PKG_CONFIG_PATH="/usr/local/openssl/lib/pkgconfig:/usr/local/openssl/lib64/pkgconfig:$PKG_CONFIG_PATH" \
31-
LD_LIBRARY_PATH="/usr/local/openssl/lib:/usr/local/openssl/lib64:$LD_LIBRARY_PATH"
29+
ENV OPENSSL_VESION=3.4.0
3230
RUN apt-get install -y zlib1g-dev perl \
3331
&& curl -sL "https://github.com/openssl/openssl/releases/download/openssl-${OPENSSL_VESION}/openssl-${OPENSSL_VESION}.tar.gz" | tar -zx -C /tmp \
3432
&& loc=$(pwd) && cd /tmp/openssl-${OPENSSL_VESION} \
35-
&& ./config --prefix=/usr/local/openssl --openssldir=/etc/ssl shared enable-ssl3 enable-ssl3-method enable-mdc2 enable-md2 \
33+
&& ./config --prefix=/usr --bindir=/usr/bin --datadir=/usr/share/openssl --docdir=/usr/share/doc/openssl --incdir=/usr/include/openssl --libdir=/usr/lib64 --shlidir=/usr/lib64 --openssldir=/etc/ssl --enable-shared --enable-ssl3 --enable-ssl3-method --enable-mdc2 --enable-md2 \
3634
&& make -j $(nproc) build_sw && make -j $(nproc) install_sw \
37-
&& cd ${local} && rm -rf /tmp/openssl-${OPENSSL_VESION} \
38-
&& ln -vsf /usr/local/openssl/bin/* /usr/bin/ \
39-
&& ln -vsf /usr/local/openssl/include/openssl /usr/include/openssl \
40-
&& echo "/usr/local/openssl/lib" >> /etc/ld.so.conf \
41-
&& echo "/usr/local/openssl/lib64" >> /etc/ld.so.conf \
35+
&& cd ${loc} && rm -rf /tmp/openssl-${OPENSSL_VESION} \
4236
&& ldconfig -v \
4337
&& openssl --version
4438

‎cpu/centos/Dockerfile

+3-9
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,13 @@ RUN yum install -y devtoolset-9 devtoolset-9-libatomic-devel devtoolset-9-elfuti
4141
RUN yum install -y glibc-static libstdc++-static
4242

4343
# OPENSSL
44-
ENV OPENSSL_VESION=3.4.0 \
45-
PKG_CONFIG_PATH="/usr/local/openssl/lib/pkgconfig:/usr/local/openssl/lib64/pkgconfig:$PKG_CONFIG_PATH" \
46-
LD_LIBRARY_PATH="/usr/local/openssl/lib:/usr/local/openssl/lib64:$LD_LIBRARY_PATH"
44+
ENV OPENSSL_VESION=3.4.0
4745
RUN yum install -y zlib-devel perl perl-IPC-Cmd perl-Test-Simple perl-CPAN \
4846
&& curl -sL "https://github.com/openssl/openssl/releases/download/openssl-${OPENSSL_VESION}/openssl-${OPENSSL_VESION}.tar.gz" | tar -zx -C /tmp \
4947
&& loc=$(pwd) && cd /tmp/openssl-${OPENSSL_VESION} \
50-
&& ./config --prefix=/usr/local/openssl --openssldir=/etc/ssl shared enable-ssl3 enable-ssl3-method enable-mdc2 enable-md2 \
48+
&& ./config --prefix=/usr --bindir=/usr/bin --datadir=/usr/share/openssl --docdir=/usr/share/doc/openssl --incdir=/usr/include/openssl --libdir=/usr/lib64 --shlidir=/usr/lib64 --openssldir=/etc/ssl --enable-shared --enable-ssl3 --enable-ssl3-method --enable-mdc2 --enable-md2 \
5149
&& make -j $(nproc) build_sw && make -j $(nproc) install_sw \
52-
&& cd ${local} && rm -rf /tmp/openssl-${OPENSSL_VESION} \
53-
&& ln -vsf /usr/local/openssl/bin/* /usr/bin/ \
54-
&& ln -vsf /usr/local/openssl/include/openssl /usr/include/openssl \
55-
&& echo "/usr/local/openssl/lib" >> /etc/ld.so.conf \
56-
&& echo "/usr/local/openssl/lib64" >> /etc/ld.so.conf \
50+
&& cd ${loc} && rm -rf /tmp/openssl-${OPENSSL_VESION} \
5751
&& ldconfig -v \
5852
&& openssl --version
5953

‎cpu/rockylinux/Dockerfile

+4-11
Original file line numberDiff line numberDiff line change
@@ -31,25 +31,18 @@ RUN dnf install -y binutils pkgconfig gcc gcc-c++ gcc-toolset-11 \
3131
RUN dnf install -y glibc-static libstdc++-static
3232

3333
# OPENSSL
34-
ENV OPENSSL_VESION=3.4.0 \
35-
PKG_CONFIG_PATH="/usr/local/openssl/lib/pkgconfig:/usr/local/openssl/lib64/pkgconfig:$PKG_CONFIG_PATH" \
36-
LD_LIBRARY_PATH="/usr/local/openssl/lib:/usr/local/openssl/lib64:$LD_LIBRARY_PATH"
34+
ENV OPENSSL_VESION=3.4.0
3735
RUN dnf install -y zlib-devel perl \
3836
&& curl -sL "https://github.com/openssl/openssl/releases/download/openssl-${OPENSSL_VESION}/openssl-${OPENSSL_VESION}.tar.gz" | tar -zx -C /tmp \
3937
&& loc=$(pwd) && cd /tmp/openssl-${OPENSSL_VESION} \
40-
&& ./config --prefix=/usr/local/openssl --openssldir=/etc/ssl shared enable-ssl3 enable-ssl3-method enable-mdc2 enable-md2 \
38+
&& ./config --prefix=/usr --bindir=/usr/bin --datadir=/usr/share/openssl --docdir=/usr/share/doc/openssl --incdir=/usr/include/openssl --libdir=/usr/lib64 --shlidir=/usr/lib64 --openssldir=/etc/ssl --enable-shared --enable-ssl3 --enable-ssl3-method --enable-mdc2 --enable-md2 \
4139
&& make -j $(nproc) build_sw && make -j $(nproc) install_sw \
42-
&& cd ${local} && rm -rf /tmp/openssl-${OPENSSL_VESION} \
43-
&& ln -vsf /usr/local/openssl/bin/* /usr/bin/ \
44-
&& ln -vsf /usr/local/openssl/include/openssl /usr/include/openssl \
45-
&& echo "/usr/local/openssl/lib" >> /etc/ld.so.conf \
46-
&& echo "/usr/local/openssl/lib64" >> /etc/ld.so.conf \
40+
&& cd ${loc} && rm -rf /tmp/openssl-${OPENSSL_VESION} \
4741
&& ldconfig -v \
4842
&& openssl --version
4943

5044
# OPENBLAS
5145
RUN dnf install -y openblas-static
5246

5347
# OPENMP
54-
RUN yum install -y libgomp openmpi openmpi-devel
55-
48+
RUN dnf install -y libgomp openmpi openmpi-devel

‎cpu/ubuntu/Dockerfile

+3-9
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,13 @@ RUN apt-get install -y binutils pkg-config gcc-11 g++-11 \
3030
RUN apt-get install -y build-essential
3131

3232
# OPENSSL
33-
ENV OPENSSL_VESION=3.4.0 \
34-
PKG_CONFIG_PATH="/usr/local/openssl/lib/pkgconfig:/usr/local/openssl/lib64/pkgconfig:$PKG_CONFIG_PATH" \
35-
LD_LIBRARY_PATH="/usr/local/openssl/lib:/usr/local/openssl/lib64:$LD_LIBRARY_PATH"
33+
ENV OPENSSL_VESION=3.4.0
3634
RUN apt-get install -y zlib1g-dev perl \
3735
&& curl -sL "https://github.com/openssl/openssl/releases/download/openssl-${OPENSSL_VESION}/openssl-${OPENSSL_VESION}.tar.gz" | tar -zx -C /tmp \
3836
&& loc=$(pwd) && cd /tmp/openssl-${OPENSSL_VESION} \
39-
&& ./config --prefix=/usr/local/openssl --openssldir=/etc/ssl shared enable-ssl3 enable-ssl3-method enable-mdc2 enable-md2 \
37+
&& ./config --prefix=/usr --bindir=/usr/bin --datadir=/usr/share/openssl --docdir=/usr/share/doc/openssl --incdir=/usr/include/openssl --libdir=/usr/lib64 --shlidir=/usr/lib64 --openssldir=/etc/ssl --enable-shared --enable-ssl3 --enable-ssl3-method --enable-mdc2 --enable-md2 \
4038
&& make -j $(nproc) build_sw && make -j $(nproc) install_sw \
41-
&& cd ${local} && rm -rf /tmp/openssl-${OPENSSL_VESION} \
42-
&& ln -vsf /usr/local/openssl/bin/* /usr/bin/ \
43-
&& ln -vsf /usr/local/openssl/include/openssl /usr/include/openssl \
44-
&& echo "/usr/local/openssl/lib" >> /etc/ld.so.conf \
45-
&& echo "/usr/local/openssl/lib64" >> /etc/ld.so.conf \
39+
&& cd ${loc} && rm -rf /tmp/openssl-${OPENSSL_VESION} \
4640
&& ldconfig -v \
4741
&& openssl --version
4842

‎cuda/centos/Dockerfile

+3-9
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,13 @@ RUN yum install -y devtoolset-9 devtoolset-9-libatomic-devel devtoolset-9-elfuti
4040
RUN yum install -y glibc-static libstdc++-static
4141

4242
# OPENSSL
43-
ENV OPENSSL_VESION=3.4.0 \
44-
PKG_CONFIG_PATH="/usr/local/openssl/lib/pkgconfig:/usr/local/openssl/lib64/pkgconfig:$PKG_CONFIG_PATH" \
45-
LD_LIBRARY_PATH="/usr/local/openssl/lib:/usr/local/openssl/lib64:$LD_LIBRARY_PATH"
43+
ENV OPENSSL_VESION=3.4.0
4644
RUN yum install -y zlib-devel perl perl-IPC-Cmd perl-Test-Simple perl-CPAN \
4745
&& curl -sL "https://github.com/openssl/openssl/releases/download/openssl-${OPENSSL_VESION}/openssl-${OPENSSL_VESION}.tar.gz" | tar -zx -C /tmp \
4846
&& loc=$(pwd) && cd /tmp/openssl-${OPENSSL_VESION} \
49-
&& ./config --prefix=/usr/local/openssl --openssldir=/etc/ssl shared enable-ssl3 enable-ssl3-method enable-mdc2 enable-md2 \
47+
&& ./config --prefix=/usr --bindir=/usr/bin --datadir=/usr/share/openssl --docdir=/usr/share/doc/openssl --incdir=/usr/include/openssl --libdir=/usr/lib64 --shlidir=/usr/lib64 --openssldir=/etc/ssl --enable-shared --enable-ssl3 --enable-ssl3-method --enable-mdc2 --enable-md2 \
5048
&& make -j $(nproc) build_sw && make -j $(nproc) install_sw \
51-
&& cd ${local} && rm -rf /tmp/openssl-${OPENSSL_VESION} \
52-
&& ln -vsf /usr/local/openssl/bin/* /usr/bin/ \
53-
&& ln -vsf /usr/local/openssl/include/openssl /usr/include/openssl \
54-
&& echo "/usr/local/openssl/lib" >> /etc/ld.so.conf \
55-
&& echo "/usr/local/openssl/lib64" >> /etc/ld.so.conf \
49+
&& cd ${loc} && rm -rf /tmp/openssl-${OPENSSL_VESION} \
5650
&& ldconfig -v \
5751
&& openssl --version
5852

‎dtk/ubuntu/Dockerfile

+6-9
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,13 @@ RUN apt-get install -y binutils pkg-config gcc-11 g++-11 \
3030
RUN apt-get install -y build-essential
3131

3232
# OPENSSL
33-
ENV OPENSSL_VESION=3.4.0 \
34-
PKG_CONFIG_PATH="/usr/local/openssl/lib/pkgconfig:/usr/local/openssl/lib64/pkgconfig:$PKG_CONFIG_PATH" \
35-
LD_LIBRARY_PATH="/usr/local/openssl/lib:/usr/local/openssl/lib64:$LD_LIBRARY_PATH"
33+
ENV OPENSSL_VESION=3.4.0
3634
RUN apt-get install -y zlib1g-dev perl \
3735
&& curl -sL "https://github.com/openssl/openssl/releases/download/openssl-${OPENSSL_VESION}/openssl-${OPENSSL_VESION}.tar.gz" | tar -zx -C /tmp \
3836
&& loc=$(pwd) && cd /tmp/openssl-${OPENSSL_VESION} \
39-
&& ./config --prefix=/usr/local/openssl --openssldir=/etc/ssl shared enable-ssl3 enable-ssl3-method enable-mdc2 enable-md2 \
37+
&& ./config --prefix=/usr --bindir=/usr/bin --datadir=/usr/share/openssl --docdir=/usr/share/doc/openssl --incdir=/usr/include/openssl --libdir=/usr/lib64 --shlidir=/usr/lib64 --openssldir=/etc/ssl --enable-shared --enable-ssl3 --enable-ssl3-method --enable-mdc2 --enable-md2 \
4038
&& make -j $(nproc) build_sw && make -j $(nproc) install_sw \
41-
&& cd ${local} && rm -rf /tmp/openssl-${OPENSSL_VESION} \
42-
&& ln -vsf /usr/local/openssl/bin/* /usr/bin/ \
43-
&& ln -vsf /usr/local/openssl/include/openssl /usr/include/openssl \
44-
&& echo "/usr/local/openssl/lib" >> /etc/ld.so.conf \
45-
&& echo "/usr/local/openssl/lib64" >> /etc/ld.so.conf \
39+
&& cd ${loc} && rm -rf /tmp/openssl-${OPENSSL_VESION} \
4640
&& ldconfig -v \
4741
&& openssl --version
4842

@@ -51,3 +45,6 @@ RUN apt-get install -y libopenblas-dev
5145

5246
# OPENMP
5347
RUN apt-get install -y libgomp1 libomp-dev
48+
49+
# FFMPEG
50+
RUN apt-get install -y ffmpeg libavformat-dev libavcodec-dev libavutil-dev

‎hip/centos/Dockerfile

+3-9
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,13 @@ RUN yum install -y devtoolset-9 devtoolset-9-libatomic-devel devtoolset-9-elfuti
4040
RUN yum install -y glibc-static libstdc++-static
4141

4242
# OPENSSL
43-
ENV OPENSSL_VESION=3.4.0 \
44-
PKG_CONFIG_PATH="/usr/local/openssl/lib/pkgconfig:/usr/local/openssl/lib64/pkgconfig:$PKG_CONFIG_PATH" \
45-
LD_LIBRARY_PATH="/usr/local/openssl/lib:/usr/local/openssl/lib64:$LD_LIBRARY_PATH"
43+
ENV OPENSSL_VESION=3.4.0
4644
RUN yum install -y zlib-devel perl perl-IPC-Cmd perl-Test-Simple perl-CPAN \
4745
&& curl -sL "https://github.com/openssl/openssl/releases/download/openssl-${OPENSSL_VESION}/openssl-${OPENSSL_VESION}.tar.gz" | tar -zx -C /tmp \
4846
&& loc=$(pwd) && cd /tmp/openssl-${OPENSSL_VESION} \
49-
&& ./config --prefix=/usr/local/openssl --openssldir=/etc/ssl shared enable-ssl3 enable-ssl3-method enable-mdc2 enable-md2 \
47+
&& ./config --prefix=/usr --bindir=/usr/bin --datadir=/usr/share/openssl --docdir=/usr/share/doc/openssl --incdir=/usr/include/openssl --libdir=/usr/lib64 --shlidir=/usr/lib64 --openssldir=/etc/ssl --enable-shared --enable-ssl3 --enable-ssl3-method --enable-mdc2 --enable-md2 \
5048
&& make -j $(nproc) build_sw && make -j $(nproc) install_sw \
51-
&& cd ${local} && rm -rf /tmp/openssl-${OPENSSL_VESION} \
52-
&& ln -vsf /usr/local/openssl/bin/* /usr/bin/ \
53-
&& ln -vsf /usr/local/openssl/include/openssl /usr/include/openssl \
54-
&& echo "/usr/local/openssl/lib" >> /etc/ld.so.conf \
55-
&& echo "/usr/local/openssl/lib64" >> /etc/ld.so.conf \
49+
&& cd ${loc} && rm -rf /tmp/openssl-${OPENSSL_VESION} \
5650
&& ldconfig -v \
5751
&& openssl --version
5852

0 commit comments

Comments
 (0)