From dcbd3f91d4b8106e4512044f309d94bbc82f17e7 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Thu, 8 Nov 2018 12:28:45 +0200 Subject: [PATCH] Do not hardcode env variables --- docker/build-base-images/Dockerfile-fedora | 6 +----- docker/build-base-images/Dockerfile-ubuntu | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/docker/build-base-images/Dockerfile-fedora b/docker/build-base-images/Dockerfile-fedora index 153469b098..80f3c01cfa 100644 --- a/docker/build-base-images/Dockerfile-fedora +++ b/docker/build-base-images/Dockerfile-fedora @@ -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/ \ No newline at end of file diff --git a/docker/build-base-images/Dockerfile-ubuntu b/docker/build-base-images/Dockerfile-ubuntu index cb879157b1..7b6cdab0ef 100644 --- a/docker/build-base-images/Dockerfile-ubuntu +++ b/docker/build-base-images/Dockerfile-ubuntu @@ -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 \ No newline at end of file + meson build/ && rm -rf build/ \ No newline at end of file