diff --git a/Dockerfile.in b/Dockerfile.in index 3b5a7e0e0c3..35e8c28bdfc 100644 --- a/Dockerfile.in +++ b/Dockerfile.in @@ -24,26 +24,26 @@ ENV DEBIAN_FRONTEND=noninteractive \ # Prepare Debian build environment RUN apt-get update \ - && apt-get upgrade -y \ - && apt-get install --no-install-recommends -y \ - curl ninja-build debhelper gnupg wget devscripts \ - mmv equivs git nasm pkg-config subversion dh-autoreconf \ - libpciaccess-dev libwayland-dev libx11-dev libx11-xcb-dev \ - libxcb-dri2-0-dev libxcb-dri3-dev libxcb-present-dev \ - libxcb-shm0-dev libxcb-sync-dev libxshmfence-dev libxext-dev \ - libxfixes-dev libxcb1-dev libxrandr-dev libzstd-dev \ - libelf-dev python3-pip zip unzip tar flex bison \ - && apt-get clean autoclean -y \ - && apt-get autoremove -y \ - && rm -rf /var/lib/apt/lists/* + && apt-get upgrade -y \ + && apt-get install --no-install-recommends -y \ + curl ninja-build debhelper gnupg wget devscripts \ + mmv equivs git nasm pkg-config subversion dh-autoreconf \ + libpciaccess-dev libwayland-dev libx11-dev libx11-xcb-dev \ + libxcb-dri2-0-dev libxcb-dri3-dev libxcb-present-dev \ + libxcb-shm0-dev libxcb-sync-dev libxshmfence-dev libxext-dev \ + libxfixes-dev libxcb1-dev libxrandr-dev libzstd-dev \ + libelf-dev python3-pip zip unzip tar flex bison \ + && apt-get clean autoclean -y \ + && apt-get autoremove -y \ + && rm -rf /var/lib/apt/lists/* # Install newer tools from pip3 RUN pip3 install $(pip3 help install | grep -o "\-\-break-system-packages") --upgrade pip \ - && pip3 install $(pip3 help install | grep -o "\-\-break-system-packages") meson cmake mako jinja2 + && pip3 install $(pip3 help install | grep -o "\-\-break-system-packages") meson cmake mako jinja2 # Avoids timeouts when using git and disable the detachedHead advice RUN git config --global http.postbuffer 524288000 \ - && git config --global advice.detachedHead false + && git config --global advice.detachedHead false # Link to docker-build script RUN ln -sf ${SOURCE_DIR}/docker-build.sh /docker-build.sh diff --git a/Dockerfile.win64.in b/Dockerfile.win64.in index 3bd1a55a8b6..717034a8497 100644 --- a/Dockerfile.win64.in +++ b/Dockerfile.win64.in @@ -24,32 +24,32 @@ ENV DEBIAN_FRONTEND=noninteractive \ # Prepare Debian and mingw-w64 build environment RUN apt-get -y update \ - && apt-get install --no-install-recommends -y \ - build-essential yasm nasm xxd pkgconf git curl \ - wget unzip subversion autoconf automake libtool \ - libtool-bin autopoint cmake clang texinfo texi2html \ - help2man flex bison gperf gettext itstool ragel \ - libc6-dev libssl-dev gtk-doc-tools gobject-introspection \ - gawk meson ninja-build p7zip-full python3-distutils \ - python3-apt python-is-python3 zip quilt \ - binutils-mingw-w64-x86-64 gcc-mingw-w64-x86-64 \ - g++-mingw-w64-x86-64 gfortran-mingw-w64-x86-64 \ - && apt-get clean autoclean -y \ - && apt-get autoremove -y \ - && rm -rf /var/lib/apt/lists/* \ - && rm -rf /usr/lib/gcc/*-w64-mingw32/*/libstdc++*.dll* \ - && rm -rf /usr/lib/gcc/*-w64-mingw32/*/libgcc_s* \ - && rm -rf /usr/lib/gcc/*-w64-mingw32/*/*.dll.a \ - && rm -rf /usr/*-w64-mingw32/lib/*.dll.a + && apt-get install --no-install-recommends -y \ + build-essential yasm nasm xxd pkgconf git curl \ + wget unzip subversion autoconf automake libtool \ + libtool-bin autopoint cmake clang texinfo texi2html \ + help2man flex bison gperf gettext itstool ragel \ + libc6-dev libssl-dev gtk-doc-tools gobject-introspection \ + gawk meson ninja-build p7zip-full python3-distutils \ + python3-apt python-is-python3 zip quilt \ + binutils-mingw-w64-x86-64 gcc-mingw-w64-x86-64 \ + g++-mingw-w64-x86-64 gfortran-mingw-w64-x86-64 \ + && apt-get clean autoclean -y \ + && apt-get autoremove -y \ + && rm -rf /var/lib/apt/lists/* \ + && rm -rf /usr/lib/gcc/*-w64-mingw32/*/libstdc++*.dll* \ + && rm -rf /usr/lib/gcc/*-w64-mingw32/*/libgcc_s* \ + && rm -rf /usr/lib/gcc/*-w64-mingw32/*/*.dll.a \ + && rm -rf /usr/*-w64-mingw32/lib/*.dll.a # Avoids timeouts when using git and disable the detachedHead advice RUN git config --global http.postbuffer 524288000 \ - && git config --global advice.detachedHead false + && git config --global advice.detachedHead false # Prepare build script and patches RUN mkdir -p /opt/ffmpeg /opt/ffdeps ${SOURCE_DIR} \ - && ln -sf ${SOURCE_DIR}/debian/patches ${SOURCE_DIR} \ - && ln -sf ${SOURCE_DIR}/docker-build-win64.sh /docker-build-win64.sh + && ln -sf ${SOURCE_DIR}/debian/patches ${SOURCE_DIR} \ + && ln -sf ${SOURCE_DIR}/docker-build-win64.sh /docker-build-win64.sh VOLUME ${ARTIFACT_DIR}/