From 0a085866ae37e8141ca4e5d0ec2c3b667eb218b6 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Mon, 15 Jun 2020 14:05:22 +0200 Subject: [PATCH] docker: move gst-indent script into docker image 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: --- docker/indent/Dockerfile | 4 +++- gitlab/ci_template.yml | 11 ++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/docker/indent/Dockerfile b/docker/indent/Dockerfile index eff3c85..63581e3 100644 --- a/docker/indent/Dockerfile +++ b/docker/indent/Dockerfile @@ -2,4 +2,6 @@ FROM debian:stretch-slim RUN apt update -yqq \ && apt install -y curl indent git findutils \ - && rm -R /var/lib/apt/ /var/log/apt/ \ No newline at end of file + && 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 diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml index 7a00304..8da024f 100644 --- a/gitlab/ci_template.yml +++ b/gitlab/ci_template.yml @@ -23,6 +23,7 @@ variables: ANDROID_TAG: '2020-06-25.0' 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' @@ -31,17 +32,14 @@ variables: ANDROID_AMD64_SUFFIX: 'amd64/android-fedora' MANIFEST_AMD64_SUFFIX: 'amd64/build-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" 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" 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" - - # 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" + INDENT_IMAGE: "$CI_REGISTRY_IMAGE/$INDENT_AMD64_SUFFIX:$INDENT_TAG-$GST_UPSTREAM_BRANCH" WINDOWS_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/windows:v11-master' @@ -283,8 +281,7 @@ gst-indent amd64 docker: stage: "build docker" variables: REPO_SUFFIX: "$INDENT_AMD64_SUFFIX" - # FIXME: Add gst-ups-branch to the tag - TAG: "$INDENT_TAG" + TAG: "$INDENT_TAG-$GST_UPSTREAM_BRANCH" CONTEXT_DIR: "docker/indent/" DOCKERFILE: "docker/indent/Dockerfile" -- 2.7.4