Commit 3960082b authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

medialibrary-win: Use a different build folder

The /build folder is used by the parent image and can't be deleted
afterward
parent bded7c44
Pipeline #7665 failed with stage
in 46 seconds
...@@ -3,8 +3,7 @@ FROM registry.videolan.org:5000/vlc-debian-llvm-mingw:20190621125349 ...@@ -3,8 +3,7 @@ FROM registry.videolan.org:5000/vlc-debian-llvm-mingw:20190621125349
ENV IMAGE_DATE=201906211545 ENV IMAGE_DATE=201906211545
USER root USER root
RUN mkdir -p /build && chown videolan /build && \ RUN mkdir -p /prefix && chown videolan /prefix
mkdir -p /prefix && chown videolan /prefix
USER videolan USER videolan
RUN TARGET_TRIPLE=i686-w64-mingw32 \ RUN TARGET_TRIPLE=i686-w64-mingw32 \
...@@ -14,7 +13,7 @@ RUN TARGET_TRIPLE=i686-w64-mingw32 \ ...@@ -14,7 +13,7 @@ RUN TARGET_TRIPLE=i686-w64-mingw32 \
JPEGTURBO_SHA256=9f397c31a67d2b00ee37597da25898b03eb282ccd87b135a50a69993b6a2035f \ JPEGTURBO_SHA256=9f397c31a67d2b00ee37597da25898b03eb282ccd87b135a50a69993b6a2035f \
RAPIDJSON_VERSION=1.1.0 \ RAPIDJSON_VERSION=1.1.0 \
RAPIDJSON_SHA256=bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e && \ RAPIDJSON_SHA256=bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e && \
mkdir -p /build && cd /build && \ mkdir -p /buildml && cd /buildml && \
git clone --depth=1 https://git.videolan.org/git/vlc.git && \ git clone --depth=1 https://git.videolan.org/git/vlc.git && \
cd vlc && \ cd vlc && \
cd extras/tools && ./bootstrap && make -j`nproc` && \ cd extras/tools && ./bootstrap && make -j`nproc` && \
...@@ -26,7 +25,7 @@ RUN TARGET_TRIPLE=i686-w64-mingw32 \ ...@@ -26,7 +25,7 @@ RUN TARGET_TRIPLE=i686-w64-mingw32 \
--disable-qtdeclarative --disable-qtgraphicaleffects --disable-qtquickcontrols \ --disable-qtdeclarative --disable-qtgraphicaleffects --disable-qtquickcontrols \
--disable-qtquickcontrols2 --disable-qtsvg && \ --disable-qtquickcontrols2 --disable-qtsvg && \
make -j`nproc` && \ make -j`nproc` && \
cd /build/vlc && ./bootstrap && mkdir build && cd build && \ cd /buildml/vlc && ./bootstrap && mkdir build && cd build && \
../configure --host=$TARGET_TRIPLE \ ../configure --host=$TARGET_TRIPLE \
--disable-lua --disable-qt --disable-skins2 \ --disable-lua --disable-qt --disable-skins2 \
--disable-nls --disable-aom \ --disable-nls --disable-aom \
...@@ -35,22 +34,22 @@ RUN TARGET_TRIPLE=i686-w64-mingw32 \ ...@@ -35,22 +34,22 @@ RUN TARGET_TRIPLE=i686-w64-mingw32 \
mkdir -p /prefix/dll && \ mkdir -p /prefix/dll && \
cp src/.libs/libvlccore.dll /prefix/dll/ && \ cp src/.libs/libvlccore.dll /prefix/dll/ && \
cp lib/.libs/libvlc.dll /prefix/dll && \ cp lib/.libs/libvlc.dll /prefix/dll && \
cd /build && wget -q https://www.sqlite.org/2018/$SQLITE_VERSION.tar.gz && \ cd /buildml && wget -q https://www.sqlite.org/2018/$SQLITE_VERSION.tar.gz && \
echo $SQLITE_SHA256 $SQLITE_VERSION.tar.gz | sha256sum -c && \ echo $SQLITE_SHA256 $SQLITE_VERSION.tar.gz | sha256sum -c && \
tar xzf $SQLITE_VERSION.tar.gz && cd $SQLITE_VERSION && \ tar xzf $SQLITE_VERSION.tar.gz && cd $SQLITE_VERSION && \
./configure --prefix=/prefix --host=$TARGET_TRIPLE --disable-shared && \ ./configure --prefix=/prefix --host=$TARGET_TRIPLE --disable-shared && \
make -j`nproc` && make install && \ make -j`nproc` && make install && \
cd /build && \ cd /buildml && \
wget -q https://downloads.sourceforge.net/project/libjpeg-turbo/1.5.0/libjpeg-turbo-$JPEGTURBO_VERSION.tar.gz && \ wget -q https://downloads.sourceforge.net/project/libjpeg-turbo/1.5.0/libjpeg-turbo-$JPEGTURBO_VERSION.tar.gz && \
echo $JPEGTURBO_SHA256 libjpeg-turbo-$JPEGTURBO_VERSION.tar.gz | sha256sum -c && \ echo $JPEGTURBO_SHA256 libjpeg-turbo-$JPEGTURBO_VERSION.tar.gz | sha256sum -c && \
tar xzf libjpeg-turbo-$JPEGTURBO_VERSION.tar.gz && \ tar xzf libjpeg-turbo-$JPEGTURBO_VERSION.tar.gz && \
cd libjpeg-turbo-$JPEGTURBO_VERSION && ./configure --host=$TARGET_TRIPLE --prefix=/prefix --disable-shared && \ cd libjpeg-turbo-$JPEGTURBO_VERSION && ./configure --host=$TARGET_TRIPLE --prefix=/prefix --disable-shared && \
make -j`nproc` && make install && \ make -j`nproc` && make install && \
cd /build && wget -q https://github.com/miloyip/rapidjson/archive/v$RAPIDJSON_VERSION.tar.gz && \ cd /buildml && wget -q https://github.com/miloyip/rapidjson/archive/v$RAPIDJSON_VERSION.tar.gz && \
echo $RAPIDJSON_SHA256 v$RAPIDJSON_VERSION.tar.gz | sha256sum -c && \ echo $RAPIDJSON_SHA256 v$RAPIDJSON_VERSION.tar.gz | sha256sum -c && \
tar xzf v1.1.0.tar.gz && cd rapidjson-1.1.0/ && \ tar xzf v1.1.0.tar.gz && cd rapidjson-1.1.0/ && \
cmake -DCMAKE_INSTALL_PREFIX=/prefix -DRAPIDJSON_BUILD_DOC=OFF \ cmake -DCMAKE_INSTALL_PREFIX=/prefix -DRAPIDJSON_BUILD_DOC=OFF \
-DRAPIDJSON_BUILD_EXAMPLES=OFF -DRAPIDJSON_BUILD_TESTS=OFF . && \ -DRAPIDJSON_BUILD_EXAMPLES=OFF -DRAPIDJSON_BUILD_TESTS=OFF . && \
make install && \ make install && \
rm -rf /build rm -rf /buildml
...@@ -3,8 +3,7 @@ FROM registry.videolan.org:5000/vlc-debian-llvm-mingw:20190621125349 ...@@ -3,8 +3,7 @@ FROM registry.videolan.org:5000/vlc-debian-llvm-mingw:20190621125349
ENV IMAGE_DATE=201906211545 ENV IMAGE_DATE=201906211545
USER root USER root
RUN mkdir -p /build && chown videolan /build && \ RUN mkdir -p /prefix && chown videolan /prefix
mkdir -p /prefix && chown videolan /prefix
USER videolan USER videolan
RUN TARGET_TRIPLE=x86_64-w64-mingw32 \ RUN TARGET_TRIPLE=x86_64-w64-mingw32 \
...@@ -14,7 +13,7 @@ RUN TARGET_TRIPLE=x86_64-w64-mingw32 \ ...@@ -14,7 +13,7 @@ RUN TARGET_TRIPLE=x86_64-w64-mingw32 \
JPEGTURBO_SHA256=9f397c31a67d2b00ee37597da25898b03eb282ccd87b135a50a69993b6a2035f \ JPEGTURBO_SHA256=9f397c31a67d2b00ee37597da25898b03eb282ccd87b135a50a69993b6a2035f \
RAPIDJSON_VERSION=1.1.0 \ RAPIDJSON_VERSION=1.1.0 \
RAPIDJSON_SHA256=bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e && \ RAPIDJSON_SHA256=bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e && \
mkdir -p /build && cd /build && \ mkdir -p /buildml && cd /buildml && \
git clone --depth=1 https://git.videolan.org/git/vlc.git && \ git clone --depth=1 https://git.videolan.org/git/vlc.git && \
cd vlc && \ cd vlc && \
cd extras/tools && ./bootstrap && make -j`nproc` && \ cd extras/tools && ./bootstrap && make -j`nproc` && \
...@@ -26,7 +25,7 @@ RUN TARGET_TRIPLE=x86_64-w64-mingw32 \ ...@@ -26,7 +25,7 @@ RUN TARGET_TRIPLE=x86_64-w64-mingw32 \
--disable-qtdeclarative --disable-qtgraphicaleffects --disable-qtquickcontrols \ --disable-qtdeclarative --disable-qtgraphicaleffects --disable-qtquickcontrols \
--disable-qtquickcontrols2 --disable-qtsvg && \ --disable-qtquickcontrols2 --disable-qtsvg && \
make -j`nproc` && \ make -j`nproc` && \
cd /build/vlc && ./bootstrap && mkdir build && cd build && \ cd /buildml/vlc && ./bootstrap && mkdir build && cd build && \
../configure --host=$TARGET_TRIPLE \ ../configure --host=$TARGET_TRIPLE \
--disable-lua --disable-qt --disable-skins2 \ --disable-lua --disable-qt --disable-skins2 \
--disable-nls --disable-aom \ --disable-nls --disable-aom \
...@@ -35,22 +34,22 @@ RUN TARGET_TRIPLE=x86_64-w64-mingw32 \ ...@@ -35,22 +34,22 @@ RUN TARGET_TRIPLE=x86_64-w64-mingw32 \
mkdir -p /prefix/dll && \ mkdir -p /prefix/dll && \
cp src/.libs/libvlccore.dll /prefix/dll/ && \ cp src/.libs/libvlccore.dll /prefix/dll/ && \
cp lib/.libs/libvlc.dll /prefix/dll && \ cp lib/.libs/libvlc.dll /prefix/dll && \
cd /build && wget -q https://www.sqlite.org/2018/$SQLITE_VERSION.tar.gz && \ cd /buildml && wget -q https://www.sqlite.org/2018/$SQLITE_VERSION.tar.gz && \
echo $SQLITE_SHA256 $SQLITE_VERSION.tar.gz | sha256sum -c && \ echo $SQLITE_SHA256 $SQLITE_VERSION.tar.gz | sha256sum -c && \
tar xzf $SQLITE_VERSION.tar.gz && cd $SQLITE_VERSION && \ tar xzf $SQLITE_VERSION.tar.gz && cd $SQLITE_VERSION && \
./configure --prefix=/prefix --host=$TARGET_TRIPLE --disable-shared && \ ./configure --prefix=/prefix --host=$TARGET_TRIPLE --disable-shared && \
make -j`nproc` && make install && \ make -j`nproc` && make install && \
cd /build && \ cd /buildml && \
wget -q https://downloads.sourceforge.net/project/libjpeg-turbo/1.5.0/libjpeg-turbo-$JPEGTURBO_VERSION.tar.gz && \ wget -q https://downloads.sourceforge.net/project/libjpeg-turbo/1.5.0/libjpeg-turbo-$JPEGTURBO_VERSION.tar.gz && \
echo $JPEGTURBO_SHA256 libjpeg-turbo-$JPEGTURBO_VERSION.tar.gz | sha256sum -c && \ echo $JPEGTURBO_SHA256 libjpeg-turbo-$JPEGTURBO_VERSION.tar.gz | sha256sum -c && \
tar xzf libjpeg-turbo-$JPEGTURBO_VERSION.tar.gz && \ tar xzf libjpeg-turbo-$JPEGTURBO_VERSION.tar.gz && \
cd libjpeg-turbo-$JPEGTURBO_VERSION && ./configure --host=$TARGET_TRIPLE --prefix=/prefix --disable-shared && \ cd libjpeg-turbo-$JPEGTURBO_VERSION && ./configure --host=$TARGET_TRIPLE --prefix=/prefix --disable-shared && \
make -j`nproc` && make install && \ make -j`nproc` && make install && \
cd /build && wget -q https://github.com/miloyip/rapidjson/archive/v$RAPIDJSON_VERSION.tar.gz && \ cd /buildml && wget -q https://github.com/miloyip/rapidjson/archive/v$RAPIDJSON_VERSION.tar.gz && \
echo $RAPIDJSON_SHA256 v$RAPIDJSON_VERSION.tar.gz | sha256sum -c && \ echo $RAPIDJSON_SHA256 v$RAPIDJSON_VERSION.tar.gz | sha256sum -c && \
tar xzf v1.1.0.tar.gz && cd rapidjson-1.1.0/ && \ tar xzf v1.1.0.tar.gz && cd rapidjson-1.1.0/ && \
cmake -DCMAKE_INSTALL_PREFIX=/prefix -DRAPIDJSON_BUILD_DOC=OFF \ cmake -DCMAKE_INSTALL_PREFIX=/prefix -DRAPIDJSON_BUILD_DOC=OFF \
-DRAPIDJSON_BUILD_EXAMPLES=OFF -DRAPIDJSON_BUILD_TESTS=OFF . && \ -DRAPIDJSON_BUILD_EXAMPLES=OFF -DRAPIDJSON_BUILD_TESTS=OFF . && \
make install && \ make install && \
rm -rf /build rm -rf /buildml
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment