Merge branch 'kill_vars' into 'main'

Remove unnecessary variables See merge request qontainers/pipglr!10
Remove unnecessary variables
2022-11-24 16:51:33 +00:00 · 2022-11-24 11:48:23 -05:00 · 2022-11-24 02:41:37 +00:00 · 2022-11-23 21:38:06 -05:00 · 2022-11-24 01:47:48 +00:00 · 2022-11-23 18:54:24 -05:00
2 changed files with 5 additions and 8 deletions
--- a/.gitlab-ci.yml
+++ b/.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" \
-            --build-arg "FLAVOR=$FLAVOR"
+            --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}"
--- 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	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