Skip to content

Commit 086e311

Browse files
committed
Enable bootc
1 parent a9f3170 commit 086e311

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

Containerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ARG IMAGE_REGISTRY=ghcr.io/ublue-os
2222

2323
COPY cosign.pub /usr/share/ublue-os/cosign.pub
2424

25-
RUN ln -sr /usr/bin/rpm-ostree /usr/bin/bootc
25+
# RUN ln -sr /usr/bin/rpm-ostree /usr/bin/bootc
2626

2727
# Copy the bling from ublue-os/bling into tmp, to be installed later by the bling module
2828
# Feel free to remove these lines if you want to speed up image builds and don't want any bling
@@ -39,7 +39,7 @@ COPY --from=ghcr.io/ublue-os/bling:latest /modules /tmp/modules/
3939
# Custom modules overwrite defaults
4040
COPY modules /tmp/modules/
4141

42-
COPY --from=ublue-os/config /rpms /tmp/rpms
42+
COPY --from=ghcr.io/ublue-os/config /rpms /tmp/rpms
4343
RUN rpm-ostree install /tmp/rpms/*.rpm
4444

4545
# `yq` is used for parsing the yaml configuration

config/recipe.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: server
44
description: A minimal Fedora ostree base image
55

66
# the base image to build on top of (FROM) and the version tag to use
7-
base-image: ghcr.io/ublue-os/ucore
7+
base-image: ghcr.io/ublue-os/ucore-hci
88
image-version: stable
99

1010
# module configuration, executed in order
@@ -39,6 +39,9 @@ modules:
3939
# - devpod # https://devpod.sh/ as an rpm
4040

4141

42+
- type: script
43+
scripts:
44+
- enable-bootc.sh
4245

4346
- type: script
4447
scripts:

config/scripts/enable-bootc.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/usr/bin/env bash
2+
set -xoue pipefail
3+
4+
ln -sr /usr/bin/rpm-ostree /usr/bin/bootc

0 commit comments

Comments
 (0)