Merge branch 'kill_vars' into 'main'

Remove unnecessary variables

See merge request qontainers/pipglr!10

.gitlab-ci.yml

@@ -11,9 +11,6 @@ build:
   image:
     name: gcr.io/kaniko-project/executor:v1.6.0-debug
     entrypoint: ["/busybox/sh", "-c"]
-  variables:
-    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'
@@ -36,5 +33,7 @@ build:
             --context $CI_PROJECT_DIR \
             --dockerfile $CI_PROJECT_DIR/Containerfile \
             --destination "${CI_REGISTRY_IMAGE}:${IMAGE_TAG}" \
-            --build-arg "BASE_TAG=$BASE_TAG" \
+            --label "org.opencontainers.image.source=${CI_PROJECT_URL}" \
-            --build-arg "FLAVOR=$FLAVOR"
+            --label "org.opencontainers.image.revision=$CI_COMMIT_SHA" \
+            --label "org.opencontainers.image.created=$CI_JOB_STARTED_AT" \
+            --label "org.opencontainers.image.version=${IMAGE_TAG}"

Containerfile

@@ -6,9 +6,7 @@
 # https://docs.gitlab.com/runner/executors/docker.html#use-podman-to-run-docker-commands
 #
 
-ARG FLAVOR="stable"
+FROM quay.io/podman/stable:v4.3.1
-ARG BASE_TAG="latest"
-FROM quay.io/podman/$FLAVOR:$BASE_TAG
 
 # 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