@@ -42,6 +42,8 @@ RUN apk add --no-cache \
4242 linux-headers \
4343 perl
4444
45+ RUN apk del libpng-dev
46+
4547### libpng
4648RUN mkdir ~/libpng_sources && \
4749 cd ~/libpng_sources && \
@@ -114,26 +116,22 @@ RUN mkdir ~/avif_sources && \
114116 cd / && rm -rf ~/avif_sources
115117
116118### ffmpeg
117- RUN mkdir ~ /ffmpeg_sources && \
118- cd ~ /ffmpeg_sources && \
119- curl -O -L https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz && \
119+ RUN mkdir -p /ffmpeg_sources && \
120+ cd /ffmpeg_sources && \
121+ curl -LO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz && \
120122 tar -xf ffmpeg-${FFMPEG_VERSION}.tar.gz && \
121123 cd ffmpeg-${FFMPEG_VERSION} && \
122- PATH=~/bin:$PATH && \
123124 PKG_CONFIG_PATH="/ffmpeg_build/lib/pkgconfig" ./configure \
124- --prefix="/usr/local " \
125- --extra-cflags="-I/ffmpeg_build/include -Wno-error=array-bounds -Wno-error=unused-variable " \
125+ --prefix="/ffmpeg_build " \
126+ --extra-cflags="-I/ffmpeg_build/include" \
126127 --extra-ldflags="-L/ffmpeg_build/lib" \
127128 --enable-openssl \
128129 --enable-libvpx \
129130 --enable-shared \
130- --enable-pic \
131- --bindir="$HOME/bin" && \
131+ --enable-pic && \
132132 make -j$(getconf _NPROCESSORS_ONLN) && \
133133 make install && \
134- echo "/ffmpeg_build/lib/" >> /etc/ld.so.conf && \
135- ldconfig && \
136- rm -rf ~/ffmpeg_sources
134+ rm -rf /ffmpeg_sources
137135
138136### ccache
139137RUN curl -O -L https://github.com/ccache/ccache/releases/download/v${CCACHE_VERSION}/ccache-${CCACHE_VERSION}.tar.gz && \
@@ -151,9 +149,10 @@ RUN adduser -D -u 1001 ci && mkdir /io && chown ci:ci /io && \
151149 chown -R ci:ci /ffmpeg_build
152150
153151USER ci
154- WORKDIR /io
155152
156153RUN git config --global --add safe.directory /io
157- ENV PATH="/home/ci/bin:/ffmpeg_build/bin:$PATH"
158- ENV LD_LIBRARY_PATH="/ffmpeg_build/lib:/usr/local/lib:$LD_LIBRARY_PATH"
159- ENV PKG_CONFIG_PATH="/ffmpeg_build/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
154+ ENV PATH="/ffmpeg_build/bin:$PATH"
155+ ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:/ffmpeg_build/lib/pkgconfig
156+ ENV LDFLAGS -L/ffmpeg_build/lib
157+ ENV PATH "$HOME/bin:$PATH"
158+ ENV LD_LIBRARY_PATH="/ffmpeg_build/lib:$LD_LIBRARY_PATH"
0 commit comments