Update test-iso.yml

2024-03-05 19:08:26 +09:00 · 2024-03-05 19:07:11 +09:00 · 2024-03-05 18:56:17 +09:00 · 2024-03-04 16:42:27 +00:00 · 2024-03-04 16:31:48 +00:00 · 2024-02-29 19:49:22 +00:00
12 changed files with 312 additions and 90 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -0,0 +1,5 @@
+.devcontainer
+.git*
+*.md
+action.yml
+LICENSE
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@ -1,2 +0,0 @@
-# Default owner of code within this repo
-* @JasonN3
--- a/.github/workflows/build-container-image.yml
+++ b/.github/workflows/build-container-image.yml
@ -1,13 +1,21 @@
 ---
 name: Build Container Image
 on:
+  merge_group:
  pull_request:
    branches:
      - main
+    paths-ignore:
+      - '*.md'
+      - 'LICENSE'
+      - 'CODEOWNERS'
  push:
    branches:
      - main
  workflow_dispatch:
+env:
+  IMAGE_NAME: "isogenerator"
+  IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}

 jobs:
  push-image:
@ -25,17 +33,144 @@ jobs:
          - 40
        include:
          - version: 39
-            support: latest
+            is_latest_version: true
+            is_stable_version: true
    steps:
-      - name: Build image
-        uses: ublue-os/build-action@1.0.1
+      # Checkout push-to-registry action GitHub repository
+      - name: Checkout Push to Registry action
+        uses: actions/checkout@v4
+
+      - name: Generate tags
+        id: generate-tags
+        shell: bash
+        run: |
+          # Generate a timestamp for creating an image version history
+          TIMESTAMP="$(date +%Y%m%d)"
+          VARIANT="${{ matrix.version }}"
+
+          COMMIT_TAGS=()
+          BUILD_TAGS=()
+
+          # Have tags for tracking builds during pull request
+          SHA_SHORT="${GITHUB_SHA::7}"
+          COMMIT_TAGS+=("pr-${{ github.event.number }}-${VARIANT}")
+          COMMIT_TAGS+=("${SHA_SHORT}-${VARIANT}")
+
+          if [[ "${{ matrix.is_latest_version }}" == "true" ]] && \
+             [[ "${{ matrix.is_stable_version }}" == "true" ]]; then
+              COMMIT_TAGS+=("pr-${{ github.event.number }}")
+              COMMIT_TAGS+=("${SHA_SHORT}")
+          fi
+
+          BUILD_TAGS=("${VARIANT}")
+
+          # Append matching timestamp tags to keep a version history
+          for TAG in "${BUILD_TAGS[@]}"; do
+              BUILD_TAGS+=("${TAG}-${TIMESTAMP}")
+          done
+
+          if [[ "${{ matrix.is_latest_version }}" == "true" ]] && \
+             [[ "${{ matrix.is_stable_version }}" == "true" ]]; then
+              BUILD_TAGS+=("${TIMESTAMP}")
+              BUILD_TAGS+=("latest")
+          fi
+
+          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
+              echo "Generated the following commit tags: "
+              for TAG in "${COMMIT_TAGS[@]}"; do
+                  echo "${TAG}"
+              done
+              alias_tags=("${COMMIT_TAGS[@]}")
+          else
+              alias_tags=("${BUILD_TAGS[@]}")
+          fi
+
+          echo "Generated the following build tags: "
+          for TAG in "${BUILD_TAGS[@]}"; do
+              echo "${TAG}"
+          done
+
+          echo "alias_tags=${alias_tags[*]}" >> $GITHUB_OUTPUT
+      - name: Get current version
+        id: labels
+        run: |
+          ver=$(skopeo inspect docker://ghcr.io/ublue-os/${{ env.IMAGE_NAME }}:${{ matrix.version }} | jq -r '.Labels["org.opencontainers.image.version"]')
+          echo "VERSION=$ver" >> $GITHUB_OUTPUT
+
+      # Build metadata
+      - name: Image Metadata
+        uses: docker/metadata-action@v5
+        id: meta
        with:
-          image_name: isogenerator
-          image_variant: main
-          version: ${{ matrix.version }}
-          support: ${{ matrix.support }}
-          signing_key: ${{ secrets.SIGNING_SECRET }}
-        continue-on-error: false
+          images: |
+            ${{ env.IMAGE_NAME }}
+
+          labels: |
+            io.artifacthub.package.readme-url=https://raw.githubusercontent.com/${{ github.repository }}/main/README.md
+            org.opencontainers.image.description=Used to generate ISO installers for OCI containers
+            org.opencontainers.image.title=${{ env.IMAGE_NAME }}
+            org.opencontainers.image.version=${{ steps.labels.outputs.VERSION }}
+
+      # Build image using Buildah action
+      - name: Build Image
+        id: build_image
+        uses: redhat-actions/buildah-build@v2
+        with:
+          containerfiles: |
+            ./Containerfile
+          # Postfix image name with -custom to make it a little more descriptive
+          # Syntax: https://docs.github.com/en/actions/learn-github-actions/expressions#format
+          image: ${{ env.IMAGE_NAME }}
+          tags: |
+            ${{ steps.generate-tags.outputs.alias_tags }}
+          build-args: |
+            VERSION=${{ matrix.version }}
+          labels: ${{ steps.meta.outputs.labels }}
+          oci: false
+
+      # Workaround bug where capital letters in your GitHub username make it impossible to push to GHCR.
+      # https://github.com/macbre/push-to-ghcr/issues/12
+      - name: Lowercase Registry
+        id: registry_case
+        uses: ASzc/change-string-case-action@v6
+        with:
+          string: ${{ env.IMAGE_REGISTRY }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      # Push the image to GHCR (Image Registry)
+      - name: Push To GHCR
+        uses: redhat-actions/push-to-registry@v2
+        id: push
+        env:
+          REGISTRY_USER: ${{ github.actor }}
+          REGISTRY_PASSWORD: ${{ github.token }}
+        with:
+          image: ${{ steps.build_image.outputs.image }}
+          tags: ${{ steps.build_image.outputs.tags }}
+          registry: ${{ steps.registry_case.outputs.lowercase }}
+          username: ${{ env.REGISTRY_USER }}
+          password: ${{ env.REGISTRY_PASSWORD }}
+          extra-args: |
+            --disable-content-trust
+
+      # Sign container
+      - uses: sigstore/cosign-installer@v3.4.0
+        if: github.event_name != 'pull_request'
+
+      - name: Sign container image
+        if: github.event_name != 'pull_request'
+        run: |
+          cosign sign -y --key env://COSIGN_PRIVATE_KEY ${{ steps.registry_case.outputs.lowercase }}/${{ steps.build_image.outputs.image }}@${TAGS}
+        env:
+          TAGS: ${{ steps.push.outputs.digest }}
+          COSIGN_EXPERIMENTAL: false
+          COSIGN_PRIVATE_KEY: ${{ secrets.SIGNING_SECRET }}

  check:
    name: Check build successful
--- a/.github/workflows/test-iso.yml
+++ b/.github/workflows/test-iso.yml
@ -10,28 +10,41 @@ on:
      - '*.md'
      - 'LICENSE'
      - 'CODEOWNERS'
+  workflow_dispatch:

 jobs:
  build-and-push-iso:
    name: Build ISO
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
    container:
      image: fedora:39
      options: "--privileged"
+      volumes:
+        - "/:/host"
    permissions:
      contents: read
      packages: write
    strategy:
      fail-fast: false
      matrix:
-        version: 
-          - 38
-          - 39
+        version: [38, 39]
+        boot: [secureboot, insecure]
+        include:
+          - boot: secureboot
+            SECURE_BOOT_KEY_URL: 'https://github.com/ublue-os/akmods/raw/main/certs/public_key.der'
+            ENROLLMENT_PASSWORD: 'ublue-os'
+            SECURE_BOOT_STRING: '-secure'
+          - boot: insecure
+            SECURE_BOOT_KEY_URL: ''
+            ENROLLMENT_PASSWORD: ''
+            SECURE_BOOT_STRING: ''
+
    steps:
      - name: Checkout
        uses: actions/checkout@v4

      - name: Build ISO
+        id: build-iso
        uses: ./
        with:
          ARCH: 'x86_64'
@ -39,8 +52,20 @@ jobs:
          IMAGE_REPO: 'ghcr.io/ublue-os'
          VARIANT: 'Kinoite'
          VERSION: ${{ matrix.version }}
-          ACTION_REPO: ${{ github.repository }}
-          ACTION_REF: ${{ github.ref }}
+          SECURE_BOOT_KEY_URL: ${{ matrix.SECURE_BOOT_KEY_URL }}
+          ENROLLMENT_PASSWORD: ${{ matrix.ENROLLMENT_PASSWORD }}
+
+      - name: Upload ISO as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: base-main-${{ matrix.version }}${{ matrix.SECURE_BOOT_STRING }}.iso
+          path: |
+            ${{ steps.build-iso.outputs.iso-path }}
+            ${{ steps.build-iso.outputs.checksum-path }}
+          if-no-files-found: error
+          retention-days: 0
+          compression-level: 0
+          overwrite: true

  check:
    name: Check build successful
@ -55,4 +80,4 @@ jobs:
        run: exit 1
      - name: Exit
        shell: bash
-        run: exit 0
+        run: exit 0
--- a/12
+++ b/12
@ -4,7 +4,7 @@ ARG VERSION=39
 FROM fedora:${VERSION}

 # Set version for the environment variables in the container.
-ARG VERSION=39
+ARG VERSION=${VERSION}

 ENV ARCH="x86_64"
 ENV IMAGE_NAME="base-main"
@ -13,12 +13,16 @@ ENV IMAGE_TAG="${VERSION}"
 ENV VARIANT="Kinoite"
 ENV VERSION="${VERSION}"
 ENV WEB_UI="false"
+ENV SECURE_BOOT_KEY_URL=""
+ENV ENROLLMENT_PASSWORD="ublue-os"

-COPY / /isogenerator
+COPY ./ /isogenerator
 WORKDIR /isogenerator

-RUN dnf install -y make && make install-deps
+RUN dnf install -y make && \
+  make install-deps && \
+  dnf clean all

 VOLUME /isogenerator/output

-ENTRYPOINT ["sh", "-c", "make output/${IMAGE_NAME}-${IMAGE_TAG}.iso ARCH=${ARCH} VERSION=${VERSION} IMAGE_REPO=${IMAGE_REPO} IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} VARIANT=${VARIANT} WEB_UI=${WEB_UI}"]
+ENTRYPOINT /isogenerator/entrypoint.sh
--- a/22
+++ b/22
@ -8,6 +8,8 @@ IMAGE_TAG = $(VERSION)
 EXTRA_BOOT_PARAMS =
 VARIANT = Kinoite
 WEB_UI = false
+ENROLLMENT_PASSWORD = ublue-os
+SECURE_BOOT_KEY_URL =

 # Generated vars
 ## Formatting = _UPPERCASE
@ -35,6 +37,7 @@ $(IMAGE_NAME)-$(IMAGE_TAG).iso: output/$(IMAGE_NAME)-$(IMAGE_TAG).iso
 output/$(IMAGE_NAME)-$(IMAGE_TAG).iso: boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.txt
 	mkdir $(_BASE_DIR)/output || true
 	xorriso -dialog on < $(_BASE_DIR)/xorriso/input.txt
+	implantisomd5 $(_BASE_DIR)/output/$(IMAGE_NAME)-$(IMAGE_TAG).iso

 # Step 1: Generate Lorax Templates
 lorax_templates/%.tmpl: lorax_templates/%.tmpl.in
@ -48,11 +51,16 @@ lorax_templates/%.tmpl: lorax_templates/%.tmpl.in

 # Step 2: Build boot.iso using Lorax
 boot.iso: lorax_templates/set_installer.tmpl lorax_templates/configure_upgrades.tmpl
-	rm -Rf $(_BASE_DIR)/results
+	rm -Rf $(_BASE_DIR)/results || true
+	rm /etc/rpm/macros.image-language-conf || true

-	# Remove the "Test this media & install" menu entry
-	sed -i '/menuentry '\''Test this media & install @PRODUCT@ @VERSION@'\'' --class fedora --class gnu-linux --class gnu --class os {/,/}/d' /usr/share/lorax/templates.d/99-generic/config_files/x86/grub2-bios.cfg
-	sed -i '/menuentry '\''Test this media & install @PRODUCT@ @VERSION@'\'' --class fedora --class gnu-linux --class gnu --class os {/,/}/d' /usr/share/lorax/templates.d/99-generic/config_files/x86/grub2-efi.cfg
+	# Set the enrollment password
+	sed 's/@ENROLLMENT_PASSWORD@/$(ENROLLMENT_PASSWORD)/' $(_BASE_DIR)/scripts/enroll-secureboot-key.sh.in > $(_BASE_DIR)/scripts/enroll-secureboot-key.sh
+
+	# Download the secure boot key
+	if [ -n "$(SECURE_BOOT_KEY_URL)" ]; then\
+    curl --fail -L -o $(_BASE_DIR)/sb_pubkey.der $(SECURE_BOOT_KEY_URL);\
+	fi

 	# Set the default menu entry to the first one
 	sed -i 's/set default="1"/set default="0"/' /usr/share/lorax/templates.d/99-generic/config_files/x86/grub2-bios.cfg
@ -62,12 +70,16 @@ boot.iso: lorax_templates/set_installer.tmpl lorax_templates/configure_upgrades.
 	sed -i 's/linux @KERNELPATH@ @ROOT@ quiet/linux @KERNELPATH@ @ROOT@ quiet $(EXTRA_BOOT_PARAMS)/g' /usr/share/lorax/templates.d/99-generic/config_files/x86/grub2-bios.cfg
 	sed -i 's/linuxefi @KERNELPATH@ @ROOT@ quiet/linuxefi @KERNELPATH@ @ROOT@ quiet $(EXTRA_BOOT_PARAMS)/g' /usr/share/lorax/templates.d/99-generic/config_files/x86/grub2-efi.cfg

+	sed -i 's/linux @KERNELPATH@ @ROOT@ rd.live.check quiet/linux @KERNELPATH@ @ROOT@ rd.live.check quiet $(EXTRA_BOOT_PARAMS)/g' /usr/share/lorax/templates.d/99-generic/config_files/x86/grub2-bios.cfg
+	sed -i 's/linuxefi @KERNELPATH@ @ROOT@ rd.live.check quiet/linuxefi @KERNELPATH@ @ROOT@ rd.live.check quiet $(EXTRA_BOOT_PARAMS)/g' /usr/share/lorax/templates.d/99-generic/config_files/x86/grub2-efi.cfg
+
 	sed -i 's/linux @KERNELPATH@ @ROOT@ nomodeset quiet/linux @KERNELPATH@ @ROOT@ nomodeset quiet $(EXTRA_BOOT_PARAMS)/g' /usr/share/lorax/templates.d/99-generic/config_files/x86/grub2-bios.cfg
 	sed -i 's/linuxefi @KERNELPATH@ @ROOT@ nomodeset quiet/linuxefi @KERNELPATH@ @ROOT@ nomodeset quiet $(EXTRA_BOOT_PARAMS)/g' /usr/share/lorax/templates.d/99-generic/config_files/x86/grub2-efi.cfg

 	sed -i 's/linux @KERNELPATH@ @ROOT@ inst.rescue quiet/linux @KERNELPATH@ @ROOT@ inst.rescue quiet $(EXTRA_BOOT_PARAMS)/g' /usr/share/lorax/templates.d/99-generic/config_files/x86/grub2-bios.cfg
 	sed -i 's/linuxefi @KERNELPATH@ @ROOT@ inst.rescue quiet/linuxefi @KERNELPATH@ @ROOT@ inst.rescue quiet $(EXTRA_BOOT_PARAMS)/g' /usr/share/lorax/templates.d/99-generic/config_files/x86/grub2-efi.cfg

+	# Build boot.iso
 	lorax -p $(IMAGE_NAME) -v $(VERSION) -r $(VERSION) -t $(VARIANT) \
          --isfinal --buildarch=$(ARCH) --volid=$(_VOLID) \
          $(_LORAX_ARGS) \
@ -87,7 +99,7 @@ container/$(IMAGE_NAME)-$(IMAGE_TAG):
 	podman rmi $(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG)

 install-deps:
-	dnf install -y lorax xorriso podman git rpm-ostree
+	dnf install -y lorax xorriso podman git

 # Step 4: Generate xorriso script
 xorriso/%.sh: xorriso/%.sh.in
--- a/README.md
+++ b/README.md
@ -16,41 +16,58 @@ This will create an ISO with the baked in defaults of the container image.
 See [Customizing](#customizing) for information about customizing the image that gets created. The variable can either be defined as environment variables or as command arguments.
 Examples:

-Creating Bluefin GTS ISO
+Creating Universal Blue Silverblue ISO
 ```bash
-docker run --rm --privileged --volume .:/isogenerator/output -e VERSION=38 -e IMAGE_NAME=bluefin -e IMAGE_TAG=gts -e VARIANT=Silverblue ghcr.io/ublue-os/isogenerator:38
+docker run --rm --privileged --volume .:/isogenerator/output -e VERSION=39 -e IMAGE_NAME=silverblue-main -e IMAGE_TAG=latest -e VARIANT=Silverblue ghcr.io/ublue-os/isogenerator:39
+```
+```bash
+# Requires sudo to run
+sudo podman run --rm --privileged --volume .:/isogenerator/output -e VERSION=39 -e IMAGE_NAME=silverblue-main -e IMAGE_TAG=latest -e VARIANT=Silverblue ghcr.io/ublue-os/isogenerator:39
 ```

-Creating Bazzite Latest ISO
+Creating Universal Blue Kinoite ISO
 ```bash
-docker run --rm --privileged --volume .:/isogenerator/output -e VERSION=39 -e IMAGE_NAME=bazzite -e IMAGE_TAG=latest -e VARIANT=Kinoite ghcr.io/ublue-os/isogenerator:39
+docker run --rm --privileged --volume .:/isogenerator/output -e VERSION=39 -e IMAGE_NAME=kinoite-main -e IMAGE_TAG=latest -e VARIANT=Kinoite ghcr.io/ublue-os/isogenerator:39
+```
+```bash
+# Requires sudo to run
+sudo podman run --rm --privileged --volume .:/isogenerator/output -e VERSION=39 -e IMAGE_NAME=kinoite-main -e IMAGE_TAG=latest -e VARIANT=Kinoite ghcr.io/ublue-os/isogenerator:39
 ```

 ## Customizing
+
+### Inputs
+
 The following variables can be used to customize the create image.

- ARCH  
-    Architecture for image to build  
-    Default Value: x86_64
- VERSION  
-    Fedora version of installer to build  
-    Default Value: 39
- IMAGE_REPO  
-    Repository containing the source container image  
-    Default Value: ghcr.io/ublue-os
- IMAGE_NAME  
-    Name of the source container image  
-    Default Value: base-main
- IMAGE_TAG  
-    Tag of the source container image  
-    Default Value: *VERSION*
- VARIANT  
-    Source container variant
-    Available options can be found by running `dnf provides system-release`. Variant will be the third item in the package name. Example: `fedora-release-kinoite-39-34.noarch` will be kinonite  
-    Default Value: Silverblue
- WEB_UI  
-    Enable Anaconda WebUI  
-    Default Value: false
+| Variable            | Description                                                  | Default Value          |
+| -----------------   | ------------------------------------------------------------ | ---------------------- |
+| ARCH                | Architecture for image to build                              | x86_64                 |
+| VERSION             | Fedora version of installer to build                         | 39                     |
+| IMAGE_REPO          | Repository containing the source container image             | ghcr.io/ublue-os       |
+| IMAGE_NAME          | Name of the source container image                           | base-main              |
+| IMAGE_TAG           | Tag of the source container image                            | *VERSION*              |
+| EXTRA_BOOT_PARAMS   | Extra params used by grub to boot the anaconda installer     | \[empty\]              |
+| VARIANT             | Source container variant\*                                   | Kinoite                |
+| WEB_UI              | Enable Anaconda WebUI (experimental)                         | false                  |
+| ENROLLMENT_PASSWORD | Password used to enroll secure boot key into BIOS\*\*        | isogenerator           |
+| SECURE_BOOT_KEY_URL | URL used to download your secure boot key for enrollment\*\* | \[empty\]              |
+
+\*Available options for VARIANT can be found by running `dnf provides system-release`. Variant will be the third item in the package name. Example: `fedora-release-kinoite-39-34.noarch` will be kinoite
+
+\*\*NOTE: ENROLLMENT_PASSWORD and SECURE_BOOT_KEY_URL are not required. They are only required if you are creating specific kernel modules or if you are using Universal Blue Kernel Modules.
+
+Our public key for our kmods is located here: https://github.com/ublue-os/akmods/raw/main/certs/public_key.der
+
+### Outputs
+
+This action outputs some useful values for you to use further on in your workflow.
+
+| Output | Description |
+| ------ | ----------- |
+| output-directory | The directory containing ISO and checksum files |
+| iso-path | The full path to the ISO file |
+| checksum-path | The full path to the checksum file |

 ## VSCode Dev Container
 There is a dev container configuration provided for development. By default it will use the existing container image available at `ghcr.io/ublue-os/isogenerator`, however, you can have it build a new image by editing `.devcontainer/devcontainer.json` and replacing `image` with `build`. `Ctrl+/` can be used to comment and uncomment blocks of code within VSCode.
--- a/action.yml
+++ b/action.yml
@ -32,14 +32,27 @@ inputs:
    description: Enable Anaconda WebUI
    required: true
    default: "false"
+  ENROLLMENT_PASSWORD:
+    description: Used for supporting secure boot (requires SECURE_BOOT_KEY_URL to be defined)
+    required: false
+    default: "ublue-os"
+  SECURE_BOOT_KEY_URL:
+    description: Secure boot key that is installed from URL location
+    required: false
  ACTION_REPO:
-    description: Repository with the build action
+    deprecationMessage: This variable is no longer used and will be removed in a future version
    required: false
-    default: ${{ github.repository }}
  ACTION_REF:
-    description: Repository ref for the build action
+    deprecationMessage: This variable is no longer used and will be removed in a future version
    required: false
-    default: ${{ github.ref }}
+
+outputs:
+  output-directory:
+    value: ${{ steps.final.outputs.OUTPUT_DIR }}
+  iso-path: 
+    value: ${{ steps.final.outputs.ISO_PATH }}
+  checksum-path: 
+    value: ${{ steps.final.outputs.CHECKSUM_PATH }} 

 runs:
  using: composite
@ -63,19 +76,13 @@ runs:
          echo "Host must be mounted as /host in order to make more space"
        fi
        
-    - name: Install make and git
+    - name: Install Make
      shell: bash
-      run: dnf install -y make git
-
-    - name: Checkout repository
-      uses: actions/checkout@v4
-      with:
-        repository: ${{ inputs.ACTION_REPO }}
-        ref: ${{ inputs.ACTION_REF }}
-        submodules: recursive
+      run: dnf install -y make

    - name: Install dependencies
      shell: bash
+      working-directory: ${{ github.action_path }}
      run: make install-deps

    - name: Lowercase Registry
@ -86,6 +93,7 @@ runs:

    - name: Download image
      shell: bash
+      working-directory: ${{ github.action_path }}
      run: |
        make container/${{ inputs.IMAGE_NAME }}-${{ inputs.IMAGE_TAG || inputs.VERSION }} \
          ARCH=${{ inputs.ARCH }} \
@ -98,6 +106,7 @@ runs:

    - name: Create boot.iso
      shell: bash
+      working-directory: ${{ github.action_path }}
      run: |
        make boot.iso \
          ARCH=${{ inputs.ARCH }} \
@ -106,11 +115,15 @@ runs:
          IMAGE_TAG=${{ inputs.IMAGE_TAG || inputs.VERSION }} \
          VARIANT=${{ inputs.VARIANT }} \
          VERSION=${{ inputs.VERSION }} \
-          WEB_UI=${{ inputs.WEB_UI }}
-          EXTRA_BOOT_PARAMS=${{ inputs.EXTRA_BOOT_PARAMS }}
+          WEB_UI=${{ inputs.WEB_UI }} \
+          EXTRA_BOOT_PARAMS=${{ inputs.EXTRA_BOOT_PARAMS }} \
+          SECURE_BOOT_KEY_URL=${{ inputs.SECURE_BOOT_KEY_URL }} \
+          ENROLLMENT_PASSWORD=${{ inputs.ENROLLMENT_PASSWORD }}

    - name: Create deploy.iso and generate sha256 checksum
      shell: bash
+      id: final
+      working-directory: ${{ github.action_path }}
      run: |
        make ${{ inputs.IMAGE_NAME }}-${{ inputs.IMAGE_TAG || inputs.VERSION }}.iso \
          ARCH=${{ inputs.ARCH }} \
@ -123,13 +136,7 @@ runs:
        mkdir end_iso
        sha256sum ${{ inputs.IMAGE_NAME }}-${{ inputs.IMAGE_TAG || inputs.VERSION }}.iso > ./end_iso/${{ inputs.IMAGE_NAME }}-${{ inputs.IMAGE_TAG || inputs.VERSION }}-CHECKSUM
        mv ${{ inputs.IMAGE_NAME }}-${{ inputs.IMAGE_TAG || inputs.VERSION }}.iso end_iso/
-
-    - name: Upload ISO as artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: ${{ inputs.IMAGE_NAME }}-${{ inputs.IMAGE_TAG || inputs.VERSION }}.iso
-        path: end_iso/*
-        if-no-files-found: error
-        retention-days: 0
-        compression-level: 0
-        overwrite: true
+        
+        echo "OUTPUT_DIR=$(realpath ./end_iso)" >> $GITHUB_OUTPUT
+        echo "ISO_PATH=$(realpath ./end_iso/${{ inputs.IMAGE_NAME }}-${{ inputs.IMAGE_TAG || inputs.VERSION }}.iso)" >> $GITHUB_OUTPUT
+        echo "CHECKSUM_PATH=$(realpath ./end_iso/${{ inputs.IMAGE_NAME }}-${{ inputs.IMAGE_TAG || inputs.VERSION }}-CHECKSUM)" >> $GITHUB_OUTPUT
--- a/entrypoint.sh
+++ b/entrypoint.sh
@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -eu
+
+# pre-create loop devices manually. In containers we can't use losetup for that.
+mknod -m 0660 /dev/loop0 b 7 0 2>/dev/null || true
+
+make output/${IMAGE_NAME}-${IMAGE_TAG}.iso \
+	ARCH=${ARCH} \
+	VERSION=${VERSION} \
+	IMAGE_REPO=${IMAGE_REPO} \
+	IMAGE_NAME=${IMAGE_NAME} \
+	IMAGE_TAG=${IMAGE_TAG} \
+	VARIANT=${VARIANT} \
+	WEB_UI=${WEB_UI} \
+	SECURE_BOOT_KEY_URL=${SECURE_BOOT_KEY_URL} \
+	ENROLLMENT_PASSWORD=${ENROLLMENT_PASSWORD}
--- a/scripts/enroll-secureboot-key.sh.in
+++ b/scripts/enroll-secureboot-key.sh.in
@ -2,14 +2,8 @@

 set -oue pipefail

-readonly SECUREBOOT_KEY="/run/install/repo/ublue-os-akmods-public-key.der"
-readonly ENROLLMENT_PASSWORD="ublue-os"
-
-SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
-if [[ ":Jupiter:Galileo:" =~ ":$SYS_ID:" ]]; then
-	echo "Steam Deck hardware detected. Skipping key enrollment."
-	exit 0
-fi
+readonly ENROLLMENT_PASSWORD=@ENROLLMENT_PASSWORD@
+readonly SECUREBOOT_KEY="/run/install/repo/sb_pubkey.der"

 if [[ ! -d "/sys/firmware/efi" ]]; then
 	echo "EFI mode not detected. Skipping key enrollment."
@ -17,8 +11,14 @@ if [[ ! -d "/sys/firmware/efi" ]]; then
 fi

 if [[ ! -f "${SECUREBOOT_KEY}" ]]; then
-	echo "Secure boot key not found: ${SECUREBOOT_KEY}"
-	exit 1
+	echo "Secure boot key not provided: ${SECUREBOOT_KEY}"
+	exit 0
+fi
+
+SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
+if [[ ":Jupiter:Galileo:" =~ ":$SYS_ID:" ]]; then
+	echo "Steam Deck hardware detected. Skipping key enrollment."
+	exit 0
 fi

 mokutil --timeout -1 || :
--- a/scripts/ublue-os-akmods-public-key.der
+++ b/scripts/ublue-os-akmods-public-key.der
--- a/xorriso/gen_input.sh.in
+++ b/xorriso/gen_input.sh.in
@ -5,8 +5,10 @@ echo "-outdev $(pwd)/output/@IMAGE_NAME@-@IMAGE_TAG@.iso"
 echo "-boot_image any replay"
 echo "-joliet on"
 echo "-compliance joliet_long_names"
-echo "-map $(pwd)/scripts/ublue-os-akmods-public-key.der ublue-os-akmods-public-key.der"
-echo "-chmod 0444 /ublue-os-akmods-public-key.der"
+if [ -f $(pwd)/sb_pubkey.der ]; then
+	echo "-map $(pwd)/sb_pubkey.der sb_pubkey.der"
+	echo "-chmod 0444 /sb_pubkey.der"
+fi
 echo "-map $(pwd)/scripts/enroll-secureboot-key.sh enroll-secureboot-key.sh"
 echo "-chmod 0777 enroll-secureboot-key.sh"
 cd container
Author	SHA1	Message	Date
Morgan	6ef674397a	Update test-iso.yml	2024-03-05 19:08:26 +09:00
Morgan	b5410c1668	Update test-iso.yml	2024-03-05 19:07:11 +09:00
Morgan	7ae9eae9fd	Update test-iso.yml	2024-03-05 18:56:17 +09:00
Noel Miller	766300bd98	fix: Container versions are not being set properly (#53 ) * fix: Container versions are not being set properly * fix: replaced build-action action * fix: removed extra } * fix: Fixed name of env variable * fix: added checkout command	2024-03-04 16:42:27 +00:00
Noel Miller	10487bbf5b	chore: Remove CODEOWNERS (#54 ) We are replacing codeowners with prow or possibly a different tool.	2024-03-04 16:31:48 +00:00
Robert Sturla	c5f825fd3e	chore: remove ACTION_REF and ACTION_REPO action inputs (#49 ) * Remove ACTION_REF and ACTION_REPO action inputs * Remove duplicate github. * Remove inputs from test-iso.yml workflow * I highly doubt this will work, but let's try it anyway * Let's try a different approach. Don't clone the repo at all, as it should already be there. Let's just set the working directory. * Do not introduce a breaking change * Say the unused variables will be removed soon	2024-02-29 19:49:22 +00:00
Robert Sturla	aa4aecdc7e	chore: remove dnf cache and unused files from built image (#26 ) * chore: add a `dnf clean all` step after installing deps * chore: only copy the required files to the image * fix: add scripts to the image * Switch to .dockerignore file --------- Co-authored-by: Noel Miller <4983138+noelmiller@users.noreply.github.com>	2024-02-29 19:49:12 +00:00
Robert Sturla	e2fbaa438c	feat: add action outputs (#47 ) * Create and document action outputs * Use outputs in upload artifact step	2024-02-29 17:01:08 +00:00
Robert Sturla	ec1f755ae3	chore: small refactoring to CI build matrix jobs (#48 ) chore: small refactoring so the build matrix job names make a bit more sense	2024-02-29 16:55:37 +00:00
Noel Miller	7a19c2dbe1	fix: sets default password in action (#46 )	2024-02-29 00:02:51 +00:00
Noel Miller	acbe229a3d	fix: removed override language macro that sets language to english (#44 ) The default is all languages and not just english.	2024-02-28 19:46:09 +00:00
Noel Miller	3822a95314	feat: Add Test Media Capability (#43 ) * feat: Allow users to override secure boot key and password when using container or action * fix: follow redirects * chore: update docs * fix: added comments and removed additional \n * fix: removed defaults * fix: added conditional for adding public key * chore(ci): Added additional test for secure boot * chore(ci): fixed up workflows to match production * fix(ci): added workflow dispatch to test * fix(ci): fixed version and added IMAGE_TAG * chore(ci): changed to bluefin to test both 38 and 39 secure boot * chore(ci): added required variables to entrypoint * chore(ci): added merge_group and added paths-ignore * chore(ci): updated description * chore(ci): set to Silverblue since we are testing Bluefin * chore(ci): Fixed secure boot key not found error Received error in anaconda when check was hit, need to set as a soft failure to exit the script early without stopping anaconda installation. * chore: fixed formatting * chore: fixed whitespace * chore(ci): Removed duplicate test * chore: fix whitespace * chore(ci): fixed test and removed upload to Github Artifacts * chore: updated README * feat: Re-enable Test Media Feature	2024-02-28 00:28:38 +00:00
Noel Miller	f70e8ea027	feat: Allow users to override secure boot key and password (#40 ) * feat: Allow users to override secure boot key and password when using container or action * fix: follow redirects * chore: update docs * fix: added comments and removed additional \n * fix: removed defaults * fix: added conditional for adding public key * chore(ci): Added additional test for secure boot * chore(ci): fixed up workflows to match production * fix(ci): added workflow dispatch to test * fix(ci): fixed version and added IMAGE_TAG * chore(ci): changed to bluefin to test both 38 and 39 secure boot * chore(ci): added required variables to entrypoint * chore(ci): added merge_group and added paths-ignore * chore(ci): updated description * chore(ci): set to Silverblue since we are testing Bluefin * chore(ci): Fixed secure boot key not found error Received error in anaconda when check was hit, need to set as a soft failure to exit the script early without stopping anaconda installation. * chore: fixed formatting * chore: fixed whitespace * chore(ci): Removed duplicate test * chore: fix whitespace * chore(ci): fixed test and removed upload to Github Artifacts * chore: updated README * fix: set password to ublue default * fix: changed enrollment password in containerfile	2024-02-28 00:06:38 +00:00
Benjamin Sherman	3401b10c56	fix: make loop device during container build of ISO (#41 ) * fix: make loop device during container build of ISO This creates the loop device during container runtime which allows lorax to build the ISO and not need to rely on a host provided device file. Fixes: #22 * chore: updated readme --------- Co-authored-by: Noel Miller <noelmiller@protonmail.com>	2024-02-27 18:06:33 +00:00
Robert Sturla	99a54d2869	chore: remove unused rpm-ostree package (#27 ) chore: remove unused rpm-ostree dependency Co-authored-by: Noel Miller <4983138+noelmiller@users.noreply.github.com>	2024-02-27 02:47:28 +00:00
Noel Miller	e36da208a8	fix: missed \ and updated README (#34 ) * fix: missed \ * fix: moved variables into table and added EXTRA_BOOT_PARAMS * Update README.md Co-authored-by: Robert Sturla <robertsturla@outlook.com> --------- Co-authored-by: Robert Sturla <robertsturla@outlook.com>	2024-02-25 14:19:17 +00:00