From 80bf0be4eb684be6289ca33e35bfe1e3f4b9f05b Mon Sep 17 00:00:00 2001 From: Nicolas Dufresne <nicolas.dufresne@collabora.com> Date: Mon, 20 Nov 2023 17:00:22 -0500 Subject: [PATCH] WIP: Use FDO template to create an upload docker images --- .gitlab-ci.yml | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 54924d0..51f9d6e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,17 +1,20 @@ +include: + - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/d03cddbc/templates/debian.yml' + +stages: + - 'build' + +variables: + GIT_DEPTH: 1 + docker image: + extends: + - '.fdo.container-build@debian' stage: build - environment: - name: $CI_COMMIT_REF_NAME - image: - name: gcr.io/kaniko-project/executor:debug - entrypoint: [""] - script: - - > - /kaniko/executor - --context $CI_PROJECT_DIR/ - --dockerfile $CI_PROJECT_DIR/Dockerfile - --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA - --single-snapshot - - echo Pushed - tags: - - lightweight + variables: + FDO_UPSTREAM_REPO: 'collabora/media-build-scripts-container' + FDO_DISTRIBUTION_TAG: "2023-11-20.1" + FDO_DISTRIBUTION_VERSION: 'bookworm' + FDO_REPO_SUFFIX: 'media/build-scripts-container' + FDO_DISTRIBUTION_PACKAGES: 'curl indent git findutils ca-certificates' + FDO_DISTRIBUTION_EXEC: 'bash prepare.sh' -- GitLab