Skip to content

Commit bc69c01

Browse files
abhiTronixabhiTronix
authored
Merge pull request #1 from abhiTronix/testing
Updates for docker images: - Added Perl build from scratch - Fixed wrong/redundant dependencies/paths - Fixed & updated OpenSSL installation - Fixed Empty continuation lines bug & added comments
2 parents 77619d3 + d71b139 commit bc69c01

File tree

2 files changed

+46
-26
lines changed

2 files changed

+46
-26
lines changed

‎docker/Dockerfile_i686‎

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,28 @@ RUN curl -O -L https://download.qt.io/archive/qt/4.8/4.8.7/qt-everywhere-opensou
1313
ENV QTDIR /opt/Qt4.8.7
1414
ENV PATH "$QTDIR/bin:$PATH"
1515

16-
RUN curl -O -L https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz && \
17-
tar -zxf cmake-3.9.0.tar.gz && \
18-
cd cmake-3.9.0 && \
19-
yum -y install curl-devel zlib-devel && \
20-
./configure --system-curl && \
21-
make && \
22-
make install && \
23-
cd .. && \
16+
RUN curl -O -L https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz && \
17+
tar -zxf cmake-3.9.0.tar.gz && \
18+
cd cmake-3.9.0 && \
19+
yum -y install curl-devel zlib-devel && \
20+
./configure --system-curl && \
21+
make -j4 && \
22+
make install && \
23+
cd .. && \
2424
rm -rf cmake-3.9.0*
2525

26-
RUN yum install autoconf automake bzip2 cmake freetype-devel gcc gcc-c++ libtool make mercurial pkgconfig perl-core zlib-devel -y && \
27-
yum remove nasm -y && \
26+
RUN curl -O -L https://www.cpan.org/src/5.0/perl-5.10.1.tar.gz && \
27+
tar -xzf perl-5.10.1.tar.gz && \
28+
yum install autoconf automake bzip2 git freetype-devel gcc gcc-c++ libtool make pkgconfig -y && \
29+
cd perl-5.10.1 && \
30+
./Configure -des -Dprefix=$HOME/ffmpeg_build && \
31+
make -j4 && \
32+
make install && \
33+
cd .. && \
34+
rm -rf perl-5.10.1* && \
35+
PATH=$HOME/ffmpeg_build/bin:$PATH #otherwise perl not detected at runtime
36+
37+
RUN yum remove nasm -y && \
2838
mkdir ~/ffmpeg_sources && \
2939
cd ~/ffmpeg_sources && \
3040
curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/2.13.02/nasm-2.13.02.tar.bz2 && \
@@ -45,19 +55,19 @@ RUN yum install autoconf automake bzip2 cmake freetype-devel gcc gcc-c++ libtool
4555
./configure --prefix="$HOME/ffmpeg_build" --disable-examples --disable-unit-tests --enable-vp9-highbitdepth --as=yasm --enable-pic --enable-shared && \
4656
make -j4 && \
4757
make install && \
48-
cd ~/ffmpeg_sources && \
58+
cd ~/ffmpeg_sources && \
4959
curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1c.tar.gz && \
5060
tar -zxvf OpenSSL_1_1_1c.tar.gz && \
5161
cd openssl-OpenSSL_1_1_1c && \
52-
./Configure --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" shared zlib && \
62+
./config --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" shared zlib && \
5363
make -j4 && \
54-
make install && \
64+
make install_sw && \ #skip building man-pages
5565
cd ~/ffmpeg_sources && \
5666
curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
5767
tar xjvf ffmpeg-snapshot.tar.bz2 && \
5868
cd ffmpeg && \
5969
PATH=~/bin:$PATH && \
60-
PKG_CONFIG_PATH="$HOME/ffmpeg_build/lib/pkgconfig" ./configure --prefix="$HOME/ffmpeg_build" --extra-cflags="-I$HOME/ffmpeg_build/include" --extra-ldflags="-L$HOME/ffmpeg_build/lib" --enable-libvpx --enable-openssl --enable-shared --enable-pic --bindir="$HOME/bin" && \
70+
PKG_CONFIG_PATH="$HOME/ffmpeg_build/lib/pkgconfig" ./configure --prefix="$HOME/ffmpeg_build" --extra-cflags="-I$HOME/ffmpeg_build/include" --extra-ldflags="-L$HOME/ffmpeg_build/lib" --enable-openssl --enable-libvpx --enable-shared --enable-pic --bindir="$HOME/bin" && \
6171
make -j4 && \
6272
make install && \
6373
echo "/root/ffmpeg_build/lib/" >> /etc/ld.so.conf && \

‎docker/Dockerfile_x86_64‎

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,28 @@ RUN curl -O -L https://download.qt.io/archive/qt/4.8/4.8.7/qt-everywhere-opensou
1313
ENV QTDIR /opt/Qt4.8.7
1414
ENV PATH "$QTDIR/bin:$PATH"
1515

16-
RUN curl -O -L https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz && \
17-
tar -zxf cmake-3.9.0.tar.gz && \
18-
cd cmake-3.9.0 && \
19-
yum -y install curl-devel zlib-devel && \
20-
./configure --system-curl && \
21-
make && \
22-
make install && \
23-
cd .. && \
16+
RUN curl -O -L https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz && \
17+
tar -zxf cmake-3.9.0.tar.gz && \
18+
cd cmake-3.9.0 && \
19+
yum -y install curl-devel zlib-devel && \
20+
./configure --system-curl && \
21+
make -j4 && \
22+
make install && \
23+
cd .. && \
2424
rm -rf cmake-3.9.0*
2525

26-
RUN yum install autoconf automake bzip2 cmake freetype-devel gcc gcc-c++ libtool make mercurial pkgconfig perl-core zlib-devel -y && \
27-
yum remove nasm -y && \
26+
RUN curl -O -L https://www.cpan.org/src/5.0/perl-5.10.1.tar.gz && \
27+
tar -xzf perl-5.10.1.tar.gz && \
28+
yum install autoconf automake bzip2 git freetype-devel gcc gcc-c++ libtool make pkgconfig -y && \
29+
cd perl-5.10.1 && \
30+
./Configure -des -Dprefix=$HOME/ffmpeg_build && \
31+
make -j4 && \
32+
make install && \
33+
cd .. && \
34+
rm -rf perl-5.10.1* && \
35+
PATH=$HOME/ffmpeg_build/bin:$PATH
36+
37+
RUN yum remove nasm -y && \
2838
mkdir ~/ffmpeg_sources && \
2939
cd ~/ffmpeg_sources && \
3040
curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/2.13.02/nasm-2.13.02.tar.bz2 && \
@@ -49,9 +59,9 @@ RUN yum install autoconf automake bzip2 cmake freetype-devel gcc gcc-c++ libtool
4959
curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1c.tar.gz && \
5060
tar -zxvf OpenSSL_1_1_1c.tar.gz && \
5161
cd openssl-OpenSSL_1_1_1c && \
52-
./Configure --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" shared zlib && \
62+
./config --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" shared zlib && \
5363
make -j4 && \
54-
make install && \
64+
make install_sw && \
5565
cd ~/ffmpeg_sources && \
5666
curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
5767
tar xjvf ffmpeg-snapshot.tar.bz2 && \

0 commit comments

Comments
 (0)