From 38719d0aefd152c3289deacea5ec2521ecdf5b79 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Fri, 24 Apr 2020 14:16:23 +1000 Subject: [PATCH] docker: remove unused Dockerfiles Part-of: --- docker/build-base-images/.dockerignore | 2 -- docker/build-base-images/Dockerfile-archlinux | 25 ------------------- docker/build-base-images/build.sh | 8 ------ docker/runtime-images/.dockerignore | 2 -- docker/runtime-images/Dockerfile-allure | 9 ------- docker/runtime-images/build.sh | 9 ------- 6 files changed, 55 deletions(-) delete mode 100644 docker/build-base-images/.dockerignore delete mode 100644 docker/build-base-images/Dockerfile-archlinux delete mode 100755 docker/build-base-images/build.sh delete mode 100644 docker/runtime-images/.dockerignore delete mode 100644 docker/runtime-images/Dockerfile-allure delete mode 100755 docker/runtime-images/build.sh diff --git a/docker/build-base-images/.dockerignore b/docker/build-base-images/.dockerignore deleted file mode 100644 index 131a0fd029..0000000000 --- a/docker/build-base-images/.dockerignore +++ /dev/null @@ -1,2 +0,0 @@ -build.sh - diff --git a/docker/build-base-images/Dockerfile-archlinux b/docker/build-base-images/Dockerfile-archlinux deleted file mode 100644 index 6ffc188e27..0000000000 --- a/docker/build-base-images/Dockerfile-archlinux +++ /dev/null @@ -1,25 +0,0 @@ -FROM base/devel:latest - -ENV LANG=en_US.UTF-8 -ENV GST_BUILD_PATH="/gst-build/" -ENV GST_VALIDATE_OUTPUT="/validate-output" -ENV GST_VALIDATE_TESTSUITES="$GST_VALIDATE_OUTPUT/gst-integration-testsuites" -ENV GST_BUILD_MESON_ARGS="-Dpython=disabled -Dlibav=enabled -Dugly=enabled -Dbad=enabled -Ddevtools=enabled -Dges=enabled -Drtsp_server=enabled -Domx=disabled -Dvaapi=disabled -Dsharp=enabled" -ENV PATH="/usr/lib/ccache/bin/:${PATH}" - -RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen - -RUN pacman -Sy --noconfirm python3 libxml2 libxslt cmake libyaml git make nodejs ninja clang llvm flex python-gobject gstreamer gst-plugins-base gst-plugins-bad gst-plugins-ugly gst-libav gst-editing-services python-pip npm json-glib gobject-introspection wget mono unzip glib2-docs xorg-xset xorg-server-xvfb ccache -RUN pip install --upgrade git+https://github.com/hotdoc/hotdoc.git@gst git+https://github.com/hotdoc/hotdoc_c_extension.git@gst meson - -RUN mkdir $GST_VALIDATE_OUTPUT && \ - git clone https://anongit.freedesktop.org/git/gstreamer/gst-integration-testsuites.git $GST_VALIDATE_TESTSUITES && \ - cd $GST_VALIDATE_TESTSUITES/medias/ && \ - python get_files.py defaults/ - -# 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 && rm -Rf build/ - -RUN rm -Rf /var/cache/pacman/ \ No newline at end of file diff --git a/docker/build-base-images/build.sh b/docker/build-base-images/build.sh deleted file mode 100755 index c8214c5b5a..0000000000 --- a/docker/build-base-images/build.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -echo Building gstreamer/build-base-fedora:latest - -docker build -t gstreamer/build-base-fedora:latest . -f Dockerfile-fedora - -echo Building gstreamer/build-base-ubuntu:latest - -docker build -t gstreamer/build-base-ubuntu:latest . -f Dockerfile-ubuntu diff --git a/docker/runtime-images/.dockerignore b/docker/runtime-images/.dockerignore deleted file mode 100644 index 131a0fd029..0000000000 --- a/docker/runtime-images/.dockerignore +++ /dev/null @@ -1,2 +0,0 @@ -build.sh - diff --git a/docker/runtime-images/Dockerfile-allure b/docker/runtime-images/Dockerfile-allure deleted file mode 100644 index 04818c2ee5..0000000000 --- a/docker/runtime-images/Dockerfile-allure +++ /dev/null @@ -1,9 +0,0 @@ -FROM anapsix/alpine-java:latest - -# Get the allure test report framework -RUN export ALLURE_VERSION=2.7.0 && \ - wget "https://bintray.com/qameta/generic/download_file?file_path=io%2Fqameta%2Fallure%2Fallure%2F2.7.0%2Fallure-${ALLURE_VERSION}.zip" -O allure.zip - unzip allure.zip && \ - mv allure-${ALLURE_VERSION} /opt/allure && \ - chmod +x /opt/allure/bin/allure && \ - rm allure.zip \ No newline at end of file diff --git a/docker/runtime-images/build.sh b/docker/runtime-images/build.sh deleted file mode 100755 index 7cdff2b090..0000000000 --- a/docker/runtime-images/build.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -echo Building gstreamer/base-fedora:latest - -docker build -t gstreamer/base-fedora:latest . -f Dockerfile-fedora - -echo Building gstreamer/base-ubuntu:latest - -docker build -t gstreamer/base-ubuntu:latest . -f Dockerfile-ubuntu -