Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/reusable-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -126,17 +126,17 @@ jobs:
if [ "$CI_MKOSI_PROFILES" != "" ] ; then
PROFILE_ARGUMENTS+=("--profile=$CI_MKOSI_PROFILES")
fi
sudo env IMAGE_FULL="localhost/${IMAGE_NAME}:latest" mkosi -B ${PROFILE_ARGUMENTS}
env IMAGE_FULL="localhost/${IMAGE_NAME}:latest" mkosi -B ${PROFILE_ARGUMENTS}

- name: Load image
id: load
run: |
sudo env IMAGE_FULL="localhost/${IMAGE_NAME}:latest" $(which just) load
env IMAGE_FULL="localhost/${IMAGE_NAME}:latest" $(which just) load

- name: Rechunk image
id: rechunk
run: |
sudo env IMAGE_FULL="localhost/${IMAGE_NAME}:latest" $(which just) ostree-rechunk
env IMAGE_FULL="localhost/${IMAGE_NAME}:latest" $(which just) rechunk

# https://github.com/actions/cache/issues/1533
- name: Hack around permission issue caching
Expand Down
4 changes: 2 additions & 2 deletions Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ rechunk:
#!/usr/bin/env bash
IMG="{{ image }}"
# podman pull $IMG # image must be available locally
export CHUNKAH_CONFIG_STR="$(sudo podman inspect "${IMG}")"
export CHUNKAH_CONFIG_STR="$(podman inspect "${IMG}")"
podman run --rm "--mount=type=image,src=${IMG},dest=/chunkah" -e CHUNKAH_CONFIG_STR quay.io/jlebon/chunkah build --label ostree.bootable=1 --compressed --max-layers 67 | \
podman load | \
sort -n | \
head -n1 | \
cut -d, -f2 | \
cut -d: -f3 | \
xargs -I{} sudo podman tag {} {{image}}
xargs -I{} podman tag {} {{image}}

clean:
mkosi clean
Expand Down
Loading