Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix image_src not setting default value #122

Merged
merged 4 commits into from
Jun 13, 2024
Merged

Fix image_src not setting default value #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec03e33
use append
JasonN3 Jun 13, 2024
e9bcb97
use one line condition
JasonN3 Jun 13, 2024
28fbd31
test image_src
JasonN3 Jun 13, 2024
1b542f7
don't upload for fake versions
JasonN3 Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/build_iso.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ jobs:
arch: ${{ needs.load_vars.outputs.ARCH }}
image_name: ${{ matrix.image_name }}
image_repo: ${{ matrix.image_repo}}
image_src: ${{ matrix.image_src }}
image_tag: ${{ matrix.version }}
version: ${{ matrix.version }}
repos: ${{ matrix.repos }}
Expand All @@ -118,6 +119,7 @@ jobs:
iso_name: build/${{ matrix.image_name }}-${{ matrix.version }}${{ matrix.flatpaks == 'false' && '' || format('-{0}', matrix.flatpaks) }}.iso

- name: Upload ISO as artifact
if: matrix.version != 'fake'
id: upload
uses: actions/upload-artifact@v4
with:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/build_vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ on:
"version": "40",
"image_repo": "quay.io/fedora",
"image_name": "fedora-bootc"
},
{
"version": "fake",
"image_repo": "quay.io/fedora",
"image_name": "fedora-bootc",
"image_src": "docker://quay.io/fedora-ostree-desktops/base:39"
}
]
}'
Expand Down
6 changes: 1 addition & 5 deletions container/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
ifeq ($(IMAGE_SRC),)
IMAGE_SRC := docker://$(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG)
endif

$(IMAGE_NAME)-$(IMAGE_TAG):
skopeo copy $(IMAGE_SRC) oci:$(IMAGE_NAME)-$(IMAGE_TAG)
skopeo copy $(if $(IMAGE_SRC),$(IMAGE_SRC),docker://$(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG)) oci:$(IMAGE_NAME)-$(IMAGE_TAG)

install-deps:
$(install_pkg) skopeo
Expand Down