From 0823a7d42f46cee1dce4ffa96f98ab17502ac8f9 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sun, 12 Jul 2020 15:15:54 +0200
Subject: [PATCH] Rework CI instructions to use build-ah-engine template
---
.gitlab-ci.yml | 29 ++++++++---------------------
1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90880b9..024db9d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,27 +1,14 @@
-image: quay.io/sheogorath/build-ah-engine:1.0.0
+include:
+ - project: container-library/build-ah-engine
+ ref: 1.2.0
+ file: /gitlab-ci-template.yml
-before_script:
- - podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-stages:
- - analyse
- - build
- - test
- - tag
- - deploy
+variables:
+ CI_REGISTRY_BUILD_ARG: "--build-arg \"VCS_REF=$CI_COMMIT_SHA\" --build-arg \"BUILD_DATE=$(date --rfc-3339 ns)\""
+ CI_REGISTRY_IMAGE_VERSION: "$(grep -e 'FROM docker.io/library/haproxy:' Dockerfile | sed -e 's/.*://' -e 's/-alpine$//')"
-build:
- stage: build
- script:
- - podman build --pull --build-arg "VCS_REF=$CI_COMMIT_SHA" --build-arg "BUILD_DATE=$(date --rfc-3339 ns)" -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
- - podman push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
-
-tagging-deploy:
- stage: tag
- script:
- - podman pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
- - si-tagging -l "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" "$CI_REGISTRY_IMAGE" "$(grep -e 'FROM docker.io/library/haproxy:' Dockerfile | sed -e 's/.*://' -e 's/-alpine$//')"
- - si-push "$CI_REGISTRY_IMAGE"
+container-tagging:
only:
- deploy
--
GitLab