Skip to content
GitLab
Verified Commit dcbd3f91 authored by Jordan Petridіs's avatar Jordan Petridіs 🌱
Browse files

Do not hardcode env variables

parent 17e6d067
Pipeline #17258 canceled with stages
in 2 seconds
Hide whitespace changes
Inline Side-by-side
docker/build-base-images/Dockerfile-fedora
View file @ dcbd3f91
...@@ -56,10 +56,6 @@ RUN dnf builddep -y \ ...@@ -56,10 +56,6 @@ RUN dnf builddep -y \
export PATH="$PATH:/usr/local/lib/python3.6/site-packages" export PATH="$PATH:/usr/local/lib/python3.6/site-packages"
ENV GST_BUILD_PATH="/gst-build/" 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 # Configure git for various usage
RUN git config --global user.email "gst-build@gstreamer.net" && git config --global user.name "Gstbuild Runner" 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 ...@@ -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 # get gst-build and make all subprojects available
RUN git clone git://anongit.freedesktop.org/gstreamer/gst-build $GST_BUILD_PATH && \ RUN git clone git://anongit.freedesktop.org/gstreamer/gst-build $GST_BUILD_PATH && \
cd $GST_BUILD_PATH && \ cd $GST_BUILD_PATH && \
meson build/ $GST_BUILD_MESON_ARGS && \ meson build/ && \
rm -rf build/ rm -rf build/
\ No newline at end of file
docker/build-base-images/Dockerfile-ubuntu
View file @ dcbd3f91
...@@ -27,10 +27,6 @@ RUN \ ...@@ -27,10 +27,6 @@ RUN \
RUN pip3 install meson RUN pip3 install meson
ENV GST_BUILD_PATH="/gst-build/" 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 # Configure git for various usage
RUN git config --global user.email "gst-build@gstreamer.net" && git config --global user.name "Gstbuild Runner" 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 ...@@ -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 # get gst-build and make all subprojects available
RUN git clone git://anongit.freedesktop.org/gstreamer/gst-build $GST_BUILD_PATH && \ RUN git clone git://anongit.freedesktop.org/gstreamer/gst-build $GST_BUILD_PATH && \
cd $GST_BUILD_PATH && \ cd $GST_BUILD_PATH && \
meson build/ $GST_BUILD_MESON_ARGS meson build/ && rm -rf build/
\ No newline at end of file \ No newline at end of file
Supports Markdown
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