public
/
bootc-base-images
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'use-builder-image' into 'main' 

ci: Switch to builder image

See merge request cgwalters-playground/sagano!18
This commit is contained in:
Colin Walters 2023-09-18 23:33:59 +00:00
parent 901c1fd704 5d6149ffb9
commit 01e484a6c2
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.gitlab-ci.yml
View File

@ -1,6 +1,5 @@
# Yes, we're using FCOS as a buildroot image: registry.gitlab.com/cgwalters-playground/sagano-builder/builder-centos:stream9
image: quay.io/fedora/fedora-coreos:stable
stages: stages:
- build - build
@ -26,9 +25,6 @@ test-build:
only: only:
- merge_requests - merge_requests
stage: build stage: build
before_script:
# Log into the registry
- echo "$CI_REGISTRY_PASSWORD" | podman login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
script: script:
- rpm-ostree install distribution-gpg-keys - rpm-ostree install distribution-gpg-keys
- set -euo pipefail; rpm-ostree compose image --format=ociarchive --initialize ${OS}-${TIER}${VARIANT}-${VERSION}.yaml dest.oci-archive - set -euo pipefail; rpm-ostree compose image --format=ociarchive --initialize ${OS}-${TIER}${VARIANT}-${VERSION}.yaml dest.oci-archive
@ -43,8 +39,7 @@ build-push:
stage: build stage: build
before_script: before_script:
# Log into the registry # Log into the registry
- echo "$CI_REGISTRY_PASSWORD" | podman login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY - echo "$CI_REGISTRY_PASSWORD" | skopeo login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
script: script:
- rpm-ostree install distribution-gpg-keys
- set -euo pipefail; rpm-ostree compose image ${COMPOSE_INITIALIZE:+--initialize} ${FORCE:+--force-nocache} --format=registry ${OS}-${TIER}${VARIANT}-${VERSION}.yaml ${CI_REGISTRY_IMAGE}/${OS}-boot-${TIER}${VARIANT}:${VERSION} - set -euo pipefail; rpm-ostree compose image ${COMPOSE_INITIALIZE:+--initialize} ${FORCE:+--force-nocache} --format=registry ${OS}-${TIER}${VARIANT}-${VERSION}.yaml ${CI_REGISTRY_IMAGE}/${OS}-boot-${TIER}${VARIANT}:${VERSION}