mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-01 08:12:30 +00:00
Code Issues 1 Projects Releases Wiki Activity

citemplate: use the fd.o pre existing buildah image to build containers

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-ci/-/merge_requests/308>
This commit is contained in:
Jordan Petridis 2020-06-25 12:49:05 +03:00 committed by Jordan Petridis
parent cece45eacb
commit 3a004f7ca4
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -19,7 +19,7 @@ test manifest amd64 docker:
stage: "build docker" stage: "build docker"
variables: variables:
REPO_SUFFIX: "$TEST_MANIFEST_AMD64_SUFFIX" REPO_SUFFIX: "$TEST_MANIFEST_AMD64_SUFFIX"
TAG: "$TEST_MANIFEST_TAG" TAG: "$TEST_MANIFEST_TAG-$GST_UPSTREAM_BRANCH"
CONTEXT_DIR: "docker/test_manifest/" CONTEXT_DIR: "docker/test_manifest/"
DOCKERFILE: "docker/test_manifest/Dockerfile" DOCKERFILE: "docker/test_manifest/Dockerfile"

10
gitlab/ci_template.yml
View file

@ -150,7 +150,7 @@ variables:
# #
# All the documentation from citemplates should be applicable here, so please refer there # All the documentation from citemplates should be applicable here, so please refer there
.base: .base:
image: 'registry.fedoraproject.org/fedora:32' image: "$CI_REGISTRY/freedesktop/ci-templates/buildah:2020-03-24"
extends: extends:
- '.global_ci_policy' - '.global_ci_policy'
tags: ['gstreamer'] tags: ['gstreamer']
@ -170,17 +170,13 @@ variables:
- export LOCAL_IMAGE="$CI_REGISTRY_IMAGE/$REPO_SUFFIX:$TAG" - export LOCAL_IMAGE="$CI_REGISTRY_IMAGE/$REPO_SUFFIX:$TAG"
- export GST_UPSTREAM_IMAGE="$CI_REGISTRY/$GST_UPSTREAM_REPO/$REPO_SUFFIX:$TAG" - export GST_UPSTREAM_IMAGE="$CI_REGISTRY/$GST_UPSTREAM_REPO/$REPO_SUFFIX:$TAG"
# FIXME: make an image since there will be multiple jobs running every pipeline
- dnf install -y skopeo jq diffutils
# Newer versions of podman/buildah try to set overlayfs mount options when # Newer versions of podman/buildah try to set overlayfs mount options when
# using the vfs driver, and this causes errors. # using the vfs driver, and this causes errors.
- sed -i '/^mountopt =.*/d' /etc/containers/storage.conf - sed -i '/^mountopt =.*/d' /etc/containers/storage.conf
- *check_image_exists - dnf upgrade -y buildah skopeo jq runc
# FIXME: make an image since there will be multiple jobs running every pipeline - *check_image_exists
- dnf install -y buildah skopeo jq runc
- echo "Building image $LOCAL_IMAGE" - echo "Building image $LOCAL_IMAGE"