WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit aaf56d0

Browse files
mauromoralesmauromorales
authored
Merge branch 'master' into ubuntu-25.04
2 parents 556eafd + 93d8cb3 commit aaf56d0

File tree

12 files changed

+24
-19
lines changed

12 files changed

+24
-19
lines changed

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# This CODEOWNERS file is used to automatically assign maintainers as reviewers for all pull requests.
2+
* @kairos-io/maintainers

‎.github/workflows/reusable-build-flavor.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ jobs:
135135
run: |
136136
docker run --rm --privileged -v /var/run/docker.sock:/var/run/docker.sock \
137137
-v $PWD/build/:/output \
138-
quay.io/kairos/auroraboot:v0.9.0 \
138+
quay.io/kairos/auroraboot:v0.10.0 \
139139
--debug \
140140
--set "disable_http_server=true" \
141141
--set "disable_netboot=true" \
@@ -148,7 +148,7 @@ jobs:
148148
mkdir build
149149
docker run --rm -v /var/run/docker.sock:/var/run/docker.sock \
150150
-v $PWD/build/:/output \
151-
quay.io/kairos/auroraboot:v0.9.0 --debug build-iso --output /output/ \
151+
quay.io/kairos/auroraboot:v0.10.0 --debug build-iso --output /output/ \
152152
docker:${{ env.IMAGE_NAME }}
153153
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
154154
if: ${{ inputs.model == 'generic' }}

‎.github/workflows/reusable-release.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ jobs:
172172
mkdir release
173173
docker run --rm -v /var/run/docker.sock:/var/run/docker.sock \
174174
-v $PWD/release:/output \
175-
quay.io/kairos/auroraboot:v0.9.0 --debug build-iso --output /output/ \
175+
quay.io/kairos/auroraboot:v0.10.0 --debug build-iso --output /output/ \
176176
docker:${{ env.IMAGE_TAG }}
177177
- name: Sign ISO sha files
178178
if: ${{ inputs.trusted_boot == 'false' && inputs.model == 'generic' }}
@@ -186,7 +186,7 @@ jobs:
186186
run: |
187187
docker run --rm --privileged -v /var/run/docker.sock:/var/run/docker.sock \
188188
-v $PWD:/output \
189-
quay.io/kairos/auroraboot:v0.9.0 \
189+
quay.io/kairos/auroraboot:v0.10.0 \
190190
--debug \
191191
--set "disable_http_server=true" \
192192
--set "disable_netboot=true" \
@@ -232,12 +232,12 @@ jobs:
232232
output: trivy.sarif
233233
severity: critical
234234
- name: Upload Trivy scan results to GitHub Security tab
235-
uses: github/codeql-action/upload-sarif@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3
235+
uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3
236236
with:
237237
sarif_file: 'trivy.sarif'
238238
category: ${{ steps.split.outputs.flavor }}-${{ steps.split.outputs.flavor_release }}-${{ inputs.variant }}-${{ inputs.arch }}-${{ inputs.model }}${{ inputs.trusted_boot != 'false' && '-uki' || '' }}
239239
- name: Upload Grype scan results to GitHub Security tab
240-
uses: github/codeql-action/upload-sarif@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3
240+
uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3
241241
with:
242242
sarif_file: 'grype.sarif'
243243
category: ${{ steps.split.outputs.flavor }}-${{ steps.split.outputs.flavor_release }}-${{ inputs.variant }}-${{ inputs.arch }}-${{ inputs.model }}${{ inputs.trusted_boot != 'false' && '-uki' || '' }}

‎.github/workflows/reusable-uki-test.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ jobs:
142142
-v $PWD/tests/assets/keys:/keys \
143143
-v $PWD/tests/assets/sysext/:/overlay \
144144
-v $PWD/build/:/output \
145-
quay.io/kairos/auroraboot:v0.9.0 --debug build-uki --output-dir /output/ --output-type iso \
145+
quay.io/kairos/auroraboot:v0.10.0 --debug build-uki --output-dir /output/ --output-type iso \
146146
--public-keys /keys \
147147
--tpm-pcr-private-key /keys/tpm2-pcr-private.pem \
148148
--sb-key /keys/db.key --sb-cert /keys/db.pem \
@@ -163,7 +163,7 @@ jobs:
163163
docker run --rm -v /var/run/docker.sock:/var/run/docker.sock \
164164
-v $PWD/build:/result \
165165
-v $PWD/tests/assets/keys:/keys \
166-
quay.io/kairos/auroraboot:v0.9.0 --debug build-uki \
166+
quay.io/kairos/auroraboot:v0.10.0 --debug build-uki \
167167
--output-dir /result --output-type container \
168168
--public-keys /keys \
169169
--tpm-pcr-private-key /keys/tpm2-pcr-private.pem \

‎.github/workflows/upload-cloud-images.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
containerImage="quay.io/kairos/ubuntu:24.04-core-amd64-generic-${latestTag}"
7575
docker run -v /var/run/docker.sock:/var/run/docker.sock --net host \
7676
--privileged \
77-
-v $PWD:/aurora --rm quay.io/kairos/auroraboot:v0.9.0 \
77+
-v $PWD:/aurora --rm quay.io/kairos/auroraboot:v0.10.0 \
7878
--debug \
7979
--set "disable_http_server=true" \
8080
--set "container_image=docker:${containerImage}" \
@@ -148,7 +148,7 @@ jobs:
148148
containerImage="quay.io/kairos/ubuntu:24.04-core-amd64-generic-${latestTag}"
149149
docker run -v /var/run/docker.sock:/var/run/docker.sock --net host \
150150
--privileged \
151-
-v $PWD:/aurora --rm quay.io/kairos/auroraboot:v0.9.0 \
151+
-v $PWD:/aurora --rm quay.io/kairos/auroraboot:v0.10.0 \
152152
--debug \
153153
--set "disable_http_server=true" \
154154
--set "container_image=docker:${containerImage}" \
@@ -221,7 +221,7 @@ jobs:
221221
containerImage="quay.io/kairos/ubuntu:24.04-core-amd64-generic-${latestTag}"
222222
docker run -v /var/run/docker.sock:/var/run/docker.sock --net host \
223223
--privileged \
224-
-v $PWD:/aurora --rm quay.io/kairos/auroraboot:v0.9.0 \
224+
-v $PWD:/aurora --rm quay.io/kairos/auroraboot:v0.10.0 \
225225
--debug \
226226
--set "disable_http_server=true" \
227227
--set "container_image=docker:${containerImage}" \

‎examples/builds/fedora-fips/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/kairos/kairos-init:v0.5.4 AS kairos-init
1+
FROM quay.io/kairos/kairos-init:v0.5.8 AS kairos-init
22

33
FROM fedora:40
44
ARG VERSION=v0.0.1

‎examples/builds/rockylinux-fips/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/kairos/kairos-init:v0.5.4 AS kairos-init
1+
FROM quay.io/kairos/kairos-init:v0.5.8 AS kairos-init
22

33
FROM rockylinux:9
44
ARG VERSION=v0.0.1

‎examples/builds/ubuntu-20.04-fips/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/kairos/kairos-init:v0.5.4 AS kairos-init
1+
FROM quay.io/kairos/kairos-init:v0.5.8 AS kairos-init
22

33
FROM ubuntu:20.04
44
ARG VERSION=v0.0.1

‎examples/builds/ubuntu-22.04-fips/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/kairos/kairos-init:v0.5.4 AS kairos-init
1+
FROM quay.io/kairos/kairos-init:v0.5.8 AS kairos-init
22

33
FROM ubuntu:22.04
44
ARG VERSION=v0.0.1

‎examples/builds/ubuntu-non-hwe/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/kairos/kairos-init:v0.5.4 AS kairos-init
1+
FROM quay.io/kairos/kairos-init:v0.5.8 AS kairos-init
22

33
FROM ubuntu:22.04 AS base-kairos
44
ARG VERSION=v0.0.1

0 commit comments

Comments
 (0)