mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 17:20:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

docker: move gst-indent script into docker image

Browse source 
This script is now very stable, so downloading it everytime is no longer useful.
It can also helps avoid network errors when running ci jobs.

Fix #70

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-ci/-/merge_requests/306>
This commit is contained in:
Guillaume Desmottes 2020-06-15 14:05:22 +02:00 committed by Jordan Petridis
parent 5c490de1bd
commit 0a085866ae
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docker/indent/Dockerfile
View file

@ -2,4 +2,6 @@ FROM debian:stretch-slim
RUN apt update -yqq \ RUN apt update -yqq \
&& apt install -y curl indent git findutils \ && apt install -y curl indent git findutils \
&& rm -R /var/lib/apt/ /var/log/apt/ && rm -R /var/lib/apt/ /var/log/apt/ \
&& curl -L -o /usr/local/bin/gst-indent https://gitlab.freedesktop.org/gstreamer/gstreamer/raw/master/tools/gst-indent \
&& chmod a+x /usr/local/bin/gst-indent

11
gitlab/ci_template.yml
View file

@ -23,6 +23,7 @@ variables:
ANDROID_TAG: '2020-06-25.0' ANDROID_TAG: '2020-06-25.0'
MANIFEST_TAG: '2020-06-25.0' MANIFEST_TAG: '2020-06-25.0'
TEST_MANIFEST_TAG: '2020-06-25.0' TEST_MANIFEST_TAG: '2020-06-25.0'
INDENT_TAG: '2020-06-29.0'
GST_UPSTREAM_REPO: 'gstreamer/gst-ci' GST_UPSTREAM_REPO: 'gstreamer/gst-ci'
@ -31,17 +32,14 @@ variables:
ANDROID_AMD64_SUFFIX: 'amd64/android-fedora' ANDROID_AMD64_SUFFIX: 'amd64/android-fedora'
MANIFEST_AMD64_SUFFIX: 'amd64/build-manifest' MANIFEST_AMD64_SUFFIX: 'amd64/build-manifest'
TEST_MANIFEST_AMD64_SUFFIX: 'amd64/test-manifest' TEST_MANIFEST_AMD64_SUFFIX: 'amd64/test-manifest'
INDENT_AMD64_SUFFIX: 'amd64/gst-indent'
FEDORA_IMAGE: "$CI_REGISTRY_IMAGE/$FEDORA_AMD64_SUFFIX:$FEDORA_TAG-$GST_UPSTREAM_BRANCH" FEDORA_IMAGE: "$CI_REGISTRY_IMAGE/$FEDORA_AMD64_SUFFIX:$FEDORA_TAG-$GST_UPSTREAM_BRANCH"
CERBERO_IMAGE: "$CI_REGISTRY_IMAGE/$CERBERO_AMD64_SUFFIX:$CERBERO_TAG-$GST_UPSTREAM_BRANCH" CERBERO_IMAGE: "$CI_REGISTRY_IMAGE/$CERBERO_AMD64_SUFFIX:$CERBERO_TAG-$GST_UPSTREAM_BRANCH"
ANDROID_IMAGE: "$CI_REGISTRY_IMAGE/$ANDROID_AMD64_SUFFIX:$ANDROID_TAG-$GST_UPSTREAM_BRANCH" ANDROID_IMAGE: "$CI_REGISTRY_IMAGE/$ANDROID_AMD64_SUFFIX:$ANDROID_TAG-$GST_UPSTREAM_BRANCH"
MANIFEST_IMAGE: "$CI_REGISTRY_IMAGE/$MANIFEST_AMD64_SUFFIX:$MANIFEST_TAG-$GST_UPSTREAM_BRANCH" MANIFEST_IMAGE: "$CI_REGISTRY_IMAGE/$MANIFEST_AMD64_SUFFIX:$MANIFEST_TAG-$GST_UPSTREAM_BRANCH"
TEST_MANIFEST_IMAGE: "$CI_REGISTRY_IMAGE/$TEST_MANIFEST_AMD64_SUFFIX:$TEST_MANIFEST_TAG-$GST_UPSTREAM_BRANCH" TEST_MANIFEST_IMAGE: "$CI_REGISTRY_IMAGE/$TEST_MANIFEST_AMD64_SUFFIX:$TEST_MANIFEST_TAG-$GST_UPSTREAM_BRANCH"
INDENT_IMAGE: "$CI_REGISTRY_IMAGE/$INDENT_AMD64_SUFFIX:$INDENT_TAG-$GST_UPSTREAM_BRANCH"
# FIXME: properly append the gst-upstream-branch once the images are rebuilt
INDENT_AMD64_SUFFIX: 'amd64/gst-indent'
INDENT_TAG: '6f7e01e1e30a73efa880acdc8e911f1f20c58dbb'
INDENT_IMAGE: "$CI_REGISTRY_IMAGE/$INDENT_AMD64_SUFFIX:$INDENT_TAG"
WINDOWS_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/windows:v11-master' WINDOWS_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/windows:v11-master'
@ -283,8 +281,7 @@ gst-indent amd64 docker:
stage: "build docker" stage: "build docker"
variables: variables:
REPO_SUFFIX: "$INDENT_AMD64_SUFFIX" REPO_SUFFIX: "$INDENT_AMD64_SUFFIX"
# FIXME: Add gst-ups-branch to the tag TAG: "$INDENT_TAG-$GST_UPSTREAM_BRANCH"
TAG: "$INDENT_TAG"
CONTEXT_DIR: "docker/indent/" CONTEXT_DIR: "docker/indent/"
DOCKERFILE: "docker/indent/Dockerfile" DOCKERFILE: "docker/indent/Dockerfile"