From efaa0622a822f8f104e72e97eaab67083220b8d2 Mon Sep 17 00:00:00 2001 From: Malte Poll Date: Thu, 17 Nov 2022 15:38:11 +0100 Subject: [PATCH] Include image version in mkosi builds --- .github/workflows/build-os-image.yml | 3 ++- image/mkosi.skeleton/usr/lib/issue.d/01_constellation.issue | 1 + image/mkosi.skeleton/usr/lib/tmpfiles.d/constellation.conf | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 image/mkosi.skeleton/usr/lib/issue.d/01_constellation.issue diff --git a/.github/workflows/build-os-image.yml b/.github/workflows/build-os-image.yml index e2e000f29..352a03742 100644 --- a/.github/workflows/build-os-image.yml +++ b/.github/workflows/build-os-image.yml @@ -196,12 +196,13 @@ jobs: shell: bash run: | echo "::group::Build" - sudo make "${CSP}" + sudo make IMAGE_VERSION="${IMAGE_VERSION}" "${CSP}" echo "::endgroup::" working-directory: ${{ github.workspace }}/image env: BOOTSTRAPPER_BINARY: ${{ github.workspace }}/build/bootstrapper DISK_MAPPER_BINARY: ${{ github.workspace }}/build/disk-mapper + IMAGE_VERSION: ${{ needs.build-settings.outputs.imageVersionUid }} CSP: ${{ matrix.csp }} - name: Collect hashes diff --git a/image/mkosi.skeleton/usr/lib/issue.d/01_constellation.issue b/image/mkosi.skeleton/usr/lib/issue.d/01_constellation.issue new file mode 100644 index 000000000..02629a748 --- /dev/null +++ b/image/mkosi.skeleton/usr/lib/issue.d/01_constellation.issue @@ -0,0 +1 @@ +\S{IMAGE_ID} \S{IMAGE_VERSION} diff --git a/image/mkosi.skeleton/usr/lib/tmpfiles.d/constellation.conf b/image/mkosi.skeleton/usr/lib/tmpfiles.d/constellation.conf index 4d11a5e22..474387816 100644 --- a/image/mkosi.skeleton/usr/lib/tmpfiles.d/constellation.conf +++ b/image/mkosi.skeleton/usr/lib/tmpfiles.d/constellation.conf @@ -2,7 +2,7 @@ d /var/lib/etcd 0700 998 997 - - d /var/log/kubernetes/audit/ 0700 0 0 - - d /run/state/bin 0755 0 0 - - -d /run/issue.d 0755 0 0 - - +C /run/issue.d - - - - /usr/lib/issue.d/ C /run/issue - - - - /usr/lib/issue # merge all CNI binaries in writable folder until containerd can use multiple CNI bins: https://github.com/containerd/containerd/issues/6600 C /opt/cni/bin - - - - /usr/libexec/cni/