Skip to content

Commit 6d67500

Browse files
author
Nate Todd
committed
Remove empty continuation lines and format
1 parent 62eec71 commit 6d67500

File tree

1 file changed

+57
-63
lines changed

1 file changed

+57
-63
lines changed

video-transcoding/Dockerfile

+57-63
Original file line numberDiff line numberDiff line change
@@ -8,53 +8,52 @@ ENV GEM_VERSION 0.19.0
88
# install build dependencies to compile ffmpeg from master
99
RUN set -ex \
1010
&& buildDeps=' \
11-
autoconf \
12-
automake \
13-
build-essential \
14-
git \
15-
libass-dev \
16-
libbz2-dev \
17-
libfontconfig1-dev \
18-
libfreetype6-dev \
19-
libfribidi-dev \
20-
libharfbuzz-dev \
21-
libjansson-dev \
22-
libogg-dev \
23-
libsamplerate-dev \
24-
libtheora-dev \
25-
libtool \
26-
libvorbis-dev \
27-
libxml2-dev \
28-
m4 \
29-
make \
30-
patch \
31-
pkg-config \
32-
python \
33-
tar \
34-
libtool-bin \
35-
texinfo \
36-
wget \
37-
zlib1g-dev \
38-
yasm \
39-
cmake \
40-
cmake-curses-gui \
41-
mercurial \
42-
libmp3lame-dev \
43-
libopus-dev \
44-
libvpx-dev \
45-
libx264-dev \
46-
unzip \
47-
mkvtoolnix \
48-
mp4v2-utils \
49-
mpv \
11+
autoconf \
12+
automake \
13+
build-essential \
14+
git \
15+
libass-dev \
16+
libbz2-dev \
17+
libfontconfig1-dev \
18+
libfreetype6-dev \
19+
libfribidi-dev \
20+
libharfbuzz-dev \
21+
libjansson-dev \
22+
libogg-dev \
23+
libsamplerate-dev \
24+
libtheora-dev \
25+
libtool \
26+
libvorbis-dev \
27+
libxml2-dev \
28+
m4 \
29+
make \
30+
patch \
31+
pkg-config \
32+
python \
33+
tar \
34+
libtool-bin \
35+
texinfo \
36+
wget \
37+
zlib1g-dev \
38+
yasm \
39+
cmake \
40+
cmake-curses-gui \
41+
mercurial \
42+
libmp3lame-dev \
43+
libopus-dev \
44+
libvpx-dev \
45+
libx264-dev \
46+
unzip \
47+
mkvtoolnix \
48+
mp4v2-utils \
49+
mpv \
5050
' \
5151
&& apt-get update \
5252
&& apt-get install -y --no-install-recommends $buildDeps \
5353
&& mkdir -p /usr/src/ffmpeg/bin \
5454
&& mkdir -p /usr/src/ffmpeg/build \
5555
&& PATH="/usr/src/ffmpeg/bin:$PATH" \
5656
&& cd /usr/src/ffmpeg \
57-
5857
# NASM 2.13.01
5958
&& wget http://www.nasm.us/pub/nasm/releasebuilds/2.13.01/nasm-2.13.01.tar.bz2 \
6059
&& tar xjvf nasm-2.13.01.tar.bz2 \
@@ -65,7 +64,6 @@ RUN set -ex \
6564
&& make install \
6665
&& cd /usr/src/ffmpeg \
6766
&& rm -rf nasm-2.13.01 \
68-
6967
# libx264 stable
7068
&& git clone -b stable http://git.videolan.org/git/x264.git x264 \
7169
&& cd x264 \
@@ -74,7 +72,6 @@ RUN set -ex \
7472
&& make install \
7573
&& cd /usr/src/ffmpeg \
7674
&& rm -rf x264-snapshot* \
77-
7875
# libfdk-aac master
7976
&& wget -O fdk-aac.tar.gz https://github.com/mstorsjo/fdk-aac/tarball/master \
8077
&& tar xzvf fdk-aac.tar.gz \
@@ -85,7 +82,6 @@ RUN set -ex \
8582
&& make install \
8683
&& cd /usr/src/ffmpeg \
8784
&& rm -rf mstorsjo-fdk-aac* \
88-
8985
# libx265 2.7
9086
&& wget -O x265.tar.gz https://bitbucket.org/multicoreware/x265/downloads/x265_2.7.tar.gz \
9187
&& tar xzvf x265.tar.gz \
@@ -95,39 +91,37 @@ RUN set -ex \
9591
&& make install \
9692
&& cd /usr/src/ffmpeg \
9793
&& rm -rf x265 \
98-
9994
# HandbrakeCli master
10095
&& git clone https://github.com/HandBrake/HandBrake.git \
10196
&& cd HandBrake \
10297
&& ./configure --launch-jobs=$(nproc) --disable-gtk --launch \
10398
&& cd build && make install \
10499
&& cd /usr/src/ffmpeg \
105100
&& rm -rf HandBrake \
106-
107101
# FFmpeg 3.3.5
108102
&& wget -O ffmpeg.zip https://github.com/FFmpeg/FFmpeg/archive/n3.3.5.zip \
109103
&& unzip ffmpeg.zip \
110104
&& mv FFmpeg* ffmpeg_src \
111105
&& cd ffmpeg_src \
112106
&& PATH="/usr/src/ffmpeg/bin:$PATH" PKG_CONFIG_PATH="/usr/src/ffmpeg/build/lib/pkgconfig" ./configure \
113-
--prefix="/usr/src/ffmpeg/build" \
114-
--pkg-config-flags="--static" \
115-
--extra-cflags="-I/usr/src/ffmpeg/build/include" \
116-
--extra-ldflags="-L/usr/src/ffmpeg/build/lib" \
117-
--bindir="/usr/src/ffmpeg/bin" \
118-
--extra-libs=-lpthread \
119-
--enable-gpl \
120-
--enable-libass \
121-
--enable-libfdk-aac \
122-
--enable-libfreetype \
123-
--enable-libmp3lame \
124-
--enable-libopus \
125-
--enable-libtheora \
126-
--enable-libvorbis \
127-
--enable-libvpx \
128-
--enable-libx264 \
129-
--enable-libx265 \
130-
--enable-nonfree \
107+
--prefix="/usr/src/ffmpeg/build" \
108+
--pkg-config-flags="--static" \
109+
--extra-cflags="-I/usr/src/ffmpeg/build/include" \
110+
--extra-ldflags="-L/usr/src/ffmpeg/build/lib" \
111+
--bindir="/usr/src/ffmpeg/bin" \
112+
--extra-libs=-lpthread \
113+
--enable-gpl \
114+
--enable-libass \
115+
--enable-libfdk-aac \
116+
--enable-libfreetype \
117+
--enable-libmp3lame \
118+
--enable-libopus \
119+
--enable-libtheora \
120+
--enable-libvorbis \
121+
--enable-libvpx \
122+
--enable-libx264 \
123+
--enable-libx265 \
124+
--enable-nonfree \
131125
&& PATH="/usr/src/ffmpeg/bin:$PATH" make -j"$(nproc)" \
132126
&& make install \
133127
&& hash -r \

0 commit comments

Comments
 (0)