Fix Cosign Image build (#95328)

2023-06-27 09:29:45 +02:00 · 2023-06-27 09:29:45 +02:00 · c3d02d68b7
parent c2f7e5840b
commit c3d02d68b7
21 changed files with 104 additions and 40 deletions
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@ -324,6 +324,10 @@ jobs:
    if: github.repository_owner == 'home-assistant'
    needs: ["init", "build_base"]
    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
    steps:
      - name: Checkout the repository
        uses: actions/checkout@v3.5.3
--- a/machine/generic-x86-64
+++ b/machine/generic-x86-64
@ -1,5 +1,8 @@
-ARG BUILD_VERSION
-FROM homeassistant/amd64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM \
+    BUILD_VERSION
+
+FROM $BUILD_FROM:$BUILD_VERSION

 RUN apk --no-cache add \
    libva-intel-driver
--- a/machine/intel-nuc
+++ b/machine/intel-nuc
@ -1,5 +1,8 @@
-ARG BUILD_VERSION
-FROM homeassistant/amd64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM \
+    BUILD_VERSION
+
+FROM $BUILD_FROM:$BUILD_VERSION

 # NOTE: intel-nuc will be replaced by generic-x86-64. Make sure to apply
 # changes in generic-x86-64 as well.
--- a/machine/khadas-vim3
+++ b/machine/khadas-vim3
@ -1,2 +1,5 @@
-ARG BUILD_VERSION
-FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM \
+    BUILD_VERSION
+
+FROM $BUILD_FROM:$BUILD_VERSION
--- a/machine/odroid-c2
+++ b/machine/odroid-c2
@ -1,2 +1,5 @@
-ARG BUILD_VERSION
-FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM \
+    BUILD_VERSION
+
+FROM $BUILD_FROM:$BUILD_VERSION
--- a/machine/odroid-c4
+++ b/machine/odroid-c4
@ -1,2 +1,5 @@
-ARG BUILD_VERSION
-FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM \
+    BUILD_VERSION
+
+FROM $BUILD_FROM:$BUILD_VERSION
--- a/machine/odroid-m1
+++ b/machine/odroid-m1
@ -1,2 +1,5 @@
-ARG BUILD_VERSION
-FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM \
+    BUILD_VERSION
+
+FROM $BUILD_FROM:$BUILD_VERSION
--- a/machine/odroid-n2
+++ b/machine/odroid-n2
@ -1,2 +1,5 @@
-ARG BUILD_VERSION
-FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM \
+    BUILD_VERSION
+
+FROM $BUILD_FROM:$BUILD_VERSION
--- a/machine/odroid-xu
+++ b/machine/odroid-xu
@ -1,2 +1,5 @@
-ARG BUILD_VERSION
-FROM homeassistant/armv7-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM \
+    BUILD_VERSION
+
+FROM $BUILD_FROM:$BUILD_VERSION
--- a/machine/qemuarm
+++ b/machine/qemuarm
@ -1,2 +1,5 @@
-ARG BUILD_VERSION
-FROM homeassistant/armhf-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM \
+    BUILD_VERSION
+
+FROM $BUILD_FROM:$BUILD_VERSION
--- a/machine/qemuarm-64
+++ b/machine/qemuarm-64
@ -1,2 +1,5 @@
-ARG BUILD_VERSION
-FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM \
+    BUILD_VERSION
+
+FROM $BUILD_FROM:$BUILD_VERSION
--- a/machine/qemux86
+++ b/machine/qemux86
@ -1,2 +1,5 @@
-ARG BUILD_VERSION
-FROM homeassistant/i386-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM \
+    BUILD_VERSION
+
+FROM $BUILD_FROM:$BUILD_VERSION
--- a/machine/qemux86-64
+++ b/machine/qemux86-64
@ -1,2 +1,5 @@
-ARG BUILD_VERSION
-FROM homeassistant/amd64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM \
+    BUILD_VERSION
+
+FROM $BUILD_FROM:$BUILD_VERSION
--- a/machine/raspberrypi
+++ b/machine/raspberrypi
@ -1,5 +1,8 @@
-ARG BUILD_VERSION
-FROM homeassistant/armhf-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM \
+    BUILD_VERSION
+
+FROM $BUILD_FROM:$BUILD_VERSION

 RUN apk --no-cache add \
        raspberrypi \
--- a/machine/raspberrypi2
+++ b/machine/raspberrypi2
@ -1,5 +1,8 @@
-ARG BUILD_VERSION
-FROM homeassistant/armv7-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM \
+    BUILD_VERSION
+
+FROM $BUILD_FROM:$BUILD_VERSION

 RUN apk --no-cache add \
        raspberrypi \
--- a/machine/raspberrypi3
+++ b/machine/raspberrypi3
@ -1,5 +1,8 @@
-ARG BUILD_VERSION
-FROM homeassistant/armv7-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM \
+    BUILD_VERSION
+
+FROM $BUILD_FROM:$BUILD_VERSION

 RUN apk --no-cache add \
        raspberrypi \
--- a/machine/raspberrypi3-64
+++ b/machine/raspberrypi3-64
@ -1,5 +1,8 @@
-ARG BUILD_VERSION
-FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM \
+    BUILD_VERSION
+
+FROM $BUILD_FROM:$BUILD_VERSION

 RUN apk --no-cache add \
        raspberrypi \
--- a/machine/raspberrypi4
+++ b/machine/raspberrypi4
@ -1,5 +1,8 @@
-ARG BUILD_VERSION
-FROM homeassistant/armv7-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM \
+    BUILD_VERSION
+
+FROM $BUILD_FROM:$BUILD_VERSION

 RUN apk --no-cache add \
        raspberrypi \
--- a/machine/raspberrypi4-64
+++ b/machine/raspberrypi4-64
@ -1,5 +1,8 @@
-ARG BUILD_VERSION
-FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM \
+    BUILD_VERSION
+
+FROM $BUILD_FROM:$BUILD_VERSION

 RUN apk --no-cache add \
        raspberrypi \
--- a/machine/tinker
+++ b/machine/tinker
@ -1,2 +1,5 @@
-ARG BUILD_VERSION
-FROM homeassistant/armv7-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM \
+    BUILD_VERSION
+
+FROM $BUILD_FROM:$BUILD_VERSION
--- a/machine/yellow
+++ b/machine/yellow
@ -1,5 +1,8 @@
-ARG BUILD_VERSION
-FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM \
+    BUILD_VERSION
+
+FROM $BUILD_FROM:$BUILD_VERSION

 RUN apk --no-cache add \
        raspberrypi \