.gitlab-ci.yml

@@ -7,8 +7,8 @@ stages:
   - tag
 
 variables:
-  CI_REGISTRY_IMAGE_VERSION: "1.2.0"
-  CI_REGISTRY_BUILD_ARG: "--build-arg SI_TOOLS_VERSION=0.3.0"
+  CI_REGISTRY_IMAGE_VERSION: "1.3.0"
+  CI_REGISTRY_BUILD_ARG: "--build-arg SI_TOOLS_VERSION=0.3.1"
 
 
 container-test:
@@ -33,5 +33,4 @@ container-test:
 
 
 container-tagging:
-  only:
-    - master
+  stage: tag

gitlab-ci-template.yml

@@ -14,12 +14,16 @@ container-build:
       - CI_REGISTRY_USER
       - CI_REGISTRY_PASSWORD
       - CI_REGISTRY_IMAGE
+      - CI_REGISTRY_BUILD_DOCKERFILE
       - CI_REGISTRY_BUILD_ARGS
-  image: quay.io/sheogorath/build-ah-engine:1.2.0
+  image: quay.io/sheogorath/build-ah-engine:1.3.0
   before_script:
     - podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+    - export BUILD_DATE=$(date --rfc-3339 ns)
+    - export VCS_REF=$CI_COMMIT_SHA
+    - export VCS_URL=$CI_PROJECT_URL
   script:
-    - si-fix
+    - si-fix "$(CI_REGISTRY_BUILD_DOCKERFILE:-./Dockerfile)"
     - podman build --pull $CI_REGISTRY_BUILD_ARGS -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA" .
     - podman push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA"
 
@@ -33,10 +37,14 @@ container-tagging:
       - CI_REGISTRY_PASSWORD
       - CI_REGISTRY_IMAGE
       - CI_REGISTRY_IMAGE_VERSION
-  image: quay.io/sheogorath/build-ah-engine:1.2.0
+  image: quay.io/sheogorath/build-ah-engine:1.3.0
   before_script:
     - podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+    - export BUILD_DATE="$(date --rfc-3339 ns)"
   script:
     - podman pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA"
     - si-tagging -l "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA" "$CI_REGISTRY_IMAGE" "${CI_REGISTRY_IMAGE_VERSION}"
     - si-push "$CI_REGISTRY_IMAGE"
+  resource_group: latest
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH