Fix PODMAN_IMAGE_NAME to use RELVER

This commit is contained in:
Jeffrey Serio 2024-03-04 17:55:20 -06:00
parent 8072c0eaa7
commit 9da05532cc

View File

@ -35,15 +35,11 @@ nonfree-build-job:
tags: tags:
- podman-in-podman - podman-in-podman
variables: variables:
PODMAN_IMAGE_NAME: "${CI_REGISTRY_IMAGE}/vauxite-nonfree:${CI_COMMIT_REF_SLUG}" RELVER: "39"
PODMAN_IMAGE_NAME: "${CI_REGISTRY_IMAGE}/vauxite-nonfree:${RELVER}"
before_script: before_script:
- podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script: script:
- cd oci/nonfree - cd oci/nonfree
- podman build -t "$PODMAN_IMAGE_NAME" . - podman build -t "$PODMAN_IMAGE_NAME" .
- podman push "$PODMAN_IMAGE_NAME" - podman push "$PODMAN_IMAGE_NAME"
- |
if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
podman tag "$PODMAN_IMAGE_NAME" "$CI_REGISTRY_IMAGE:latest"
podman push "$CI_REGISTRY_IMAGE:latest"
fi