Remove broken workflow rules

They were preventing builds on main and on tags. Rather than try and debug them, just kill them as they're mostly unnecessary for this repo. Signed-off-by: Chris Evich <chris_gitlab@icuc.me>
Fix build job not running on main or tag push
2022-11-25 23:28:47 -05:00 · 2022-11-25 23:26:35 -05:00 · 2022-11-26 04:20:51 +00:00 · 2022-11-25 23:15:26 -05:00 · 2022-11-24 16:51:33 +00:00 · 2022-11-24 11:48:23 -05:00
2 changed files with 39 additions and 25 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,25 +1,39 @@
 ---

-stages:
-    - build
-
-build:
-  stage: build
+default:
+  image: quay.io/buildah/stable:v1.28.0
  tags:
    - docker
    - linux
-  image:
-    name: gcr.io/kaniko-project/executor:v1.6.0-debug
-    entrypoint: ["/busybox/sh", "-c"]
+
+envars:
+  stage: test
+  script: |
+    echo "Select CI env. vars.:";
+    printenv | egrep '^CI_' | sort
+
+commit_check:
+  stage: test
  variables:
-    BASE_TAG: latest
-    FLAVOR: stable
+    BADRX: '^(squash!)|(fixup!)'
+  script: |
+    dnf install -y git
+    shortlogtmp=$(mktemp -p '' commit_check_tmp_XXXX)
+    git log --oneline --no-show-signature "${CI_MERGE_REQUEST_DIFF_BASE_SHA}..HEAD" > "$shortlogtmp"
+    if egrep -q "$BADRX" "$shortlogtmp"; then
+        egrep "$BADRX" "$shortlogtmp"
+        die "Found the above commits matching '$BADRX'"
+    fi
+
+build:
+  stage: deploy
+  variables:
+    BUILDAH_FORMAT: docker
+    BUILDAH_ISOLATION: chroot
+    STORAGE_DRIVER: vfs
+  before_script:
+    - echo "$CI_REGISTRY_PASSWORD" | buildah login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
  script:
-    - 'mkdir -p /kaniko/.docker'
-    - 'echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json'
-    - |
-        echo "Select CI env. vars.:";
-        printenv | egrep '^CI_' | sort
    # N/B: There could be more than one merge-request open with this branch's HEAD
    - |
        IMAGE_TAG="${CI_COMMIT_BRANCH}";
@@ -31,10 +45,12 @@ build:
            IMAGE_TAG="latest";
        fi
        echo "Building/Pushing to: ${CI_REGISTRY_IMAGE}:${IMAGE_TAG}";
-    - |
-        /kaniko/executor \
-            --context $CI_PROJECT_DIR \
-            --dockerfile $CI_PROJECT_DIR/Containerfile \
-            --destination "${CI_REGISTRY_IMAGE}:${IMAGE_TAG}" \
-            --build-arg "BASE_TAG=$BASE_TAG" \
-            --build-arg "FLAVOR=$FLAVOR"
+    - >-
+      buildah build \
+        --label "org.opencontainers.image.source=${CI_PROJECT_URL}" \
+        --label "org.opencontainers.image.revision=$CI_COMMIT_SHA" \
+        --label "org.opencontainers.image.created=$CI_JOB_STARTED_AT" \
+        --label "org.opencontainers.image.version=${IMAGE_TAG}" \
+        -t "${CI_REGISTRY_IMAGE}:${IMAGE_TAG}" "$CI_PROJECT_DIR"
+    - buildah images
+    - buildah push "${CI_REGISTRY_IMAGE}:${IMAGE_TAG}"
--- a/4
+++ b/4
@@ -6,9 +6,7 @@
 # https://docs.gitlab.com/runner/executors/docker.html#use-podman-to-run-docker-commands
 #

-ARG FLAVOR="stable"
-ARG BASE_TAG="latest"
-FROM quay.io/podman/$FLAVOR:$BASE_TAG
+FROM quay.io/podman/stable:v4.3.1

 # This is a list of packages to remove and/or exclude from the image.
 # Primarily this is done for security reasons, should a runner process
Author	SHA1	Message	Date
Chris Evich	b591a3d7c5	Remove broken workflow rules They were preventing builds on main and on tags. Rather than try and debug them, just kill them as they're mostly unnecessary for this repo. Signed-off-by: Chris Evich <chris_gitlab@icuc.me>	2022-11-25 23:28:47 -05:00
Chris Evich	b21181a446	Fix build job not running on main or tag push Signed-off-by: Chris Evich <chris_gitlab@icuc.me>	2022-11-25 23:26:35 -05:00
Chris Evich	c80dfffa14	Merge branch 'switch_to_buildah' into 'main' Switch to using buildah See merge request qontainers/pipglr!11	2022-11-26 04:20:51 +00:00
Chris Evich	cbb3eb0e22	Switch to using buildah Observations show the runtime is about the same (since performance is mostly storage-io bound. However, buildah images are more compact and there are simpler possibilities for build-caching available for future use. Signed-off-by: Chris Evich <chris_gitlab@icuc.me>	2022-11-25 23:15:26 -05:00
Chris Evich	98e2bee2a5	Merge branch 'kill_vars' into 'main' Remove unnecessary variables See merge request qontainers/pipglr!10	2022-11-24 16:51:33 +00:00
Chris Evich	4b25e62b52	Remove unnecessary variables Signed-off-by: Chris Evich <chris_gitlab@icuc.me>	2022-11-24 11:48:23 -05:00
Chris Evich	1c08727c5d	Merge branch 'simplify_metadata' into 'main' Simplify image metadata See merge request qontainers/pipglr!9	2022-11-24 02:41:37 +00:00
Chris Evich	af84720d71	Simplify image metadata Signed-off-by: Chris Evich <chris_gitlab@icuc.me>	2022-11-23 21:38:06 -05:00
Chris Evich	c748c4f928	Merge branch 'image_metadata' into 'main' Add metadata to image See merge request qontainers/pipglr!8	2022-11-24 01:47:48 +00:00
Chris Evich	5164551f98	Add metadata to image Also, pin base image to a specific version instead of `latest`. Signed-off-by: Chris Evich <chris_gitlab@icuc.me>	2022-11-23 18:54:24 -05:00