This commit is contained in:
Neil Hanlon 2022-06-13 11:13:44 -04:00
parent f7a74536c0
commit 4187d6d12d
Signed by: neil
GPG Key ID: 705BC21EC3C70F34
3 changed files with 17 additions and 6 deletions

View File

@ -3,7 +3,7 @@ name: Build container images
on: on:
push: push:
branches: [ $default-branch, imagefactory ] branches: [ $default-branch ]
pull_request: pull_request:
branches: [ $default-branch ] branches: [ $default-branch ]
workflow_dispatch: workflow_dispatch:
@ -16,10 +16,21 @@ jobs:
matrix: matrix:
architecture: architecture:
- x64 - x64
- ARM64 - arm64
version:
- 8
- 9.0-rc
include:
- version: 9.0-rc
experimental: true
experimental: [false]
runs-on: runs-on:
- self-hosted - self-hosted
- ${{ matrix.architecture }} - ${{ matrix.architecture }}
continue-on-error: ${{ matrix.experimental }}
env:
CI_RELEASE: ${{ matrix.version }}
DEBUG: 1
steps: steps:
- name: Checkout sig-cloud-instance-images - name: Checkout sig-cloud-instance-images
uses: actions/checkout@v2 uses: actions/checkout@v2

View File

@ -1,6 +1,5 @@
name: Scan images using trivy name: Scan images using trivy
on: on:
push:
workflow_dispatch: workflow_dispatch:
schedule: schedule:
- cron: "0 13 * * *" - cron: "0 13 * * *"

View File

@ -1,14 +1,15 @@
ARCH = $(shell uname -m) ARCH = $(shell uname -m)
BUILDDATE = $(shell /bin/date +%Y%m%d_%H%M) BUILDDATE = $(shell /bin/date +%Y%m%d_%H%M)
KICKSTART_DIR = kickstarts
KICKSTART_PATH = "${KICKSTART_DIR}/Rocky-8-Container.ks"
LOG_DIR = logs LOG_DIR = logs
OUT = out OUT = out
RELEASE_VER = 8.6 RELEASE_VER = $(shell echo ${CI_RELEASE})
MAJOR = $(shell v='$(RELEASE_VER)'; echo "$${v%.*}") MAJOR = $(shell v='$(RELEASE_VER)'; echo "$${v%.*}")
TEMPLATE_DIR = templates TEMPLATE_DIR = templates
TEMPLATE_PATH = "${TEMPLATE_DIR}/tdl-${ARCH}.xml" TEMPLATE_PATH = "${TEMPLATE_DIR}/tdl-${ARCH}.xml"
KICKSTART_DIR = kickstarts
KICKSTART_PATH = "${KICKSTART_DIR}/Rocky-${MAJOR}-Container.ks"
OUTNAME := rocky-${RELEASE_VER}-docker OUTNAME := rocky-${RELEASE_VER}-docker
BASEIMAGE_META := base_image-$(OUTNAME).meta BASEIMAGE_META := base_image-$(OUTNAME).meta
TARGETIMAGE_META := target_image-$(OUTNAME).meta TARGETIMAGE_META := target_image-$(OUTNAME).meta