Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-03-25 16:18:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Include image version in mkosi builds

Browse Source
This commit is contained in:
Malte Poll 2022-11-17 15:38:11 +01:00 committed by Malte Poll
parent 74aabe86fa
commit efaa0622a8
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/build-os-image.yml vendored
View File

@ -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

1
image/mkosi.skeleton/usr/lib/issue.d/01_constellation.issue Normal file
View File

@ -0,0 +1 @@
\S{IMAGE_ID} \S{IMAGE_VERSION}

2
image/mkosi.skeleton/usr/lib/tmpfiles.d/constellation.conf
View File

@ -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/