mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-03 01:02:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

Do not hardcode env variables

Browse source
This commit is contained in:
Jordan Petridis 2018-11-08 12:28:45 +02:00
parent 17e6d06735
commit dcbd3f91d4
No known key found for this signature in database
GPG key ID: 902CC06D159744F5
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docker/build-base-images/Dockerfile-fedora
View file

@ -56,10 +56,6 @@ RUN dnf builddep -y \
export PATH="$PATH:/usr/local/lib/python3.6/site-packages"
ENV GST_BUILD_PATH="/gst-build/"
ENV GST_VALIDATE_OUTPUT="/validate-output"
ENV GST_VALIDATE_TESTSUITES="$GST_VALIDATE_OUTPUT/gst-integration-testsuites"
# FIXME Enabled gst-libav.
ENV GST_BUILD_MESON_ARGS="-Dpython=disabled -Dlibav=disabled -Dugly=enabled -Dbad=enabled -Ddevtools=enabled -Dges=enabled -Drtsp_server=enabled -Domx=disabled -Dvaapi=disabled -Dsharp=disabled"
# Configure git for various usage
RUN git config --global user.email "gst-build@gstreamer.net" && git config --global user.name "Gstbuild Runner"
@ -67,5 +63,5 @@ RUN git config --global user.email "gst-build@gstreamer.net" && git config --glo
# get gst-build and make all subprojects available
RUN git clone git://anongit.freedesktop.org/gstreamer/gst-build $GST_BUILD_PATH && \
cd $GST_BUILD_PATH && \
meson build/ $GST_BUILD_MESON_ARGS && \
meson build/ && \
rm -rf build/

6
docker/build-base-images/Dockerfile-ubuntu
View file

@ -27,10 +27,6 @@ RUN \
RUN pip3 install meson
ENV GST_BUILD_PATH="/gst-build/"
ENV GST_VALIDATE_OUTPUT="/validate-output"
ENV GST_VALIDATE_TESTSUITES="$GST_VALIDATE_OUTPUT/gst-integration-testsuites"
# FIXME Enabled gst-libav.
ENV GST_BUILD_MESON_ARGS="-Dpython=disabled -Dlibav=disabled -Dugly=enabled -Dbad=enabled -Ddevtools=enabled -Dges=enabled -Drtsp_server=enabled -Domx=disabled -Dvaapi=disabled -Dsharp=disabled"
# Configure git for various usage
RUN git config --global user.email "gst-build@gstreamer.net" && git config --global user.name "Gstbuild Runner"
@ -38,4 +34,4 @@ RUN git config --global user.email "gst-build@gstreamer.net" && git config --glo
# get gst-build and make all subprojects available
RUN git clone git://anongit.freedesktop.org/gstreamer/gst-build $GST_BUILD_PATH && \
cd $GST_BUILD_PATH && \
meson build/ $GST_BUILD_MESON_ARGS
meson build/ && rm -rf build/