1
0
Fork 0
mirror of https://github.com/JasonN3/build-container-installer.git synced 2025-12-25 10:57:55 +01:00

Merge branch 'main' into make

This commit is contained in:
Jason N 2024-03-26 18:43:54 -04:00 committed by GitHub
commit 0f231557e6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -210,27 +210,27 @@ runs:
else else
if [[ -n "${{ inputs.flatpak_remote_refs }}" ]] if [[ -n "${{ inputs.flatpak_remote_refs }}" ]]
then then
vars="${vars} \"FLATPAK_REMOTE_REFS=${{ inputs.flatpak_remote_refs }}\"" vars="${vars} FLATPAK_REMOTE_REFS=\"${{ inputs.flatpak_remote_refs }}\""
else else
vars="${vars} \"FLATPAK_REMOTE_REFS_DIR=${{ inputs.flatpak_remote_refs_dir }}\"" vars="${vars} FLATPAK_REMOTE_REFS_DIR=\"${{ inputs.flatpak_remote_refs_dir }}\""
fi fi
fi fi
docker run --privileged --volume ${{ github.workspace }}:/github/workspace/ ${cache} ${image}:${tag} \ docker run --privileged --volume ${{ github.workspace }}:/github/workspace/ ${cache} ${image}:${tag} \
"ADDITIONAL_TEMPLATES=${{ inputs.additional_templates }}" \ ADDITIONAL_TEMPLATES="${{ inputs.additional_templates }}" \
"ARCH=${{ inputs.arch }}" \ ARCH="${{ inputs.arch }}" \
"DNF_CACHE=/cache/dnf" \ DNF_CACHE="/cache/dnf" \
"ENROLLMENT_PASSWORD=${{ inputs.enrollment_password }}" \ ENROLLMENT_PASSWORD="${{ inputs.enrollment_password }}" \
"FLATPAK_REMOTE_NAME=${{ inputs.flatpak_remote_name }}" \ FLATPAK_REMOTE_NAME="${{ inputs.flatpak_remote_name }}" \
${vars} \ ${vars} \
"FLATPAK_REMOTE_URL=${{ inputs.flatpak_remote_url }}" \ FLATPAK_REMOTE_URL="${{ inputs.flatpak_remote_url }}" \
"FLATPAK_DIR=${{ steps.flatpak_dependencies.outputs.flatpak_dir && format('/github/workspace/{0}', steps.flatpak_dependencies.outputs.flatpak_dir) || '' }}" \ FLATPAK_DIR="${{ steps.flatpak_dependencies.outputs.flatpak_dir && format('/github/workspace/{0}', steps.flatpak_dependencies.outputs.flatpak_dir) || '' }}" \
"IMAGE_NAME=${{ inputs.image_name }}" \ IMAGE_NAME="${{ inputs.image_name }}" \
"IMAGE_REPO=${{ inputs.image_repo }}" \ IMAGE_REPO="${{ inputs.image_repo }}" \
"IMAGE_TAG=${{ inputs.image_tag || inputs.version }}" \ IMAGE_TAG="${{ inputs.image_tag || inputs.version }}" \
"SECURE_BOOT_KEY_URL=${{ inputs.secure_boot_key_url }}" \ SECURE_BOOT_KEY_URL="${{ inputs.secure_boot_key_url }}" \
"VARIANT=${{ inputs.variant }}" \ VARIANT="${{ inputs.variant }}" \
"VERSION=${{ inputs.version }}" \ VERSION="${{ inputs.version }}" \
"WEB_UI=${{ inputs.web_ui }}" WEB_UI="${{ inputs.web_ui }}"
- name: Save dnf cache - name: Save dnf cache
env: env: