Merge branch 'bugfix' into 'main'

Fix CI/CD typo and other misc items

See merge request qontainers/pipglr!4

.gitignore

@@ -0,0 +1 @@
+/.pre-commit-config.yaml

.gitlab-ci.yml

@@ -15,13 +15,22 @@ build:
     BASE_TAG: latest
     FLAVOR: stable
   script:
-    - mkdir -p /kaniko/.docker
-    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
-    - IMAGE_TAG="${CI_COMMIT_TAG:+${CI_COMMIT_TAG}}${CI_MERGE_REQUEST_IID:+mr${CI_MERGE_REQUEST_IID}${CI_COMMIT_BRANCH:+${CI_COMMIT_BRANCH/main/latest}}"
-    - >-
-        /kaniko/executor
-            --context $CI_PROJECT_DIR
-            --dockerfile $CI_PROJECT_DIR/Containerfile
-            --destination "$CI_REGISTRY_IMAGE:${IAMGE_TAG}"
-            --build-arg "BASE_TAG=$BASE_TAG"
+    - '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_TAG:+${CI_COMMIT_TAG}}${CI_COMMIT_BRANCH:+${CI_COMMIT_BRANCH/main/latest}}";
+        if [[ -n "$CI_OPEN_MERGE_REQUESTS" ]]; then
+            IMAGE_TAG=mr$(echo "${CI_OPEN_MERGE_REQUESTS}" | cut -d, -f -1 | cut -d\! -f 2);
+        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"

Containerfile

@@ -107,11 +107,11 @@ ENTRYPOINT ["/usr/local/bin/gitlab-runner-wrapper"]
 
 # Gitlab-runner configuration options.  Default to unprivileged (nested)
 # runner.  Privileged is required to permit nested container image building.
-ARG RUNNER_NAME="pipglr"
+ARG RUNNER_NAME="qontainers-pipglr"
 ARG PRIVILEGED_RUNNER="false"
 # Tags allow pinning jobs to specific runners, comma-separated list of
 # tags to add to runner (no spaces!)
-ARG RUNNER_TAGS="podman_in_podman"
+ARG RUNNER_TAGS="podman-in-podman"
 # Permit running jobs without any tag at all
 ARG RUNNER_UNTAGGED="true"
 ENV REGISTER_NON_INTERACTIVE="true" \