Skip to content

Commit

Permalink
Merge branch 'main' into castrojo-patch-3
Browse files Browse the repository at this point in the history
  • Loading branch information
castrojo authored Nov 25, 2023
2 parents 11bdf9d + 48c27d6 commit b17b571
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
5 changes: 1 addition & 4 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,10 @@ RUN wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-$(
wget https://copr.fedorainfracloud.org/coprs/kylegospo/oversteer/repo/fedora-$(rpm -E %fedora)/kylegospo-oversteer-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo_oversteer.repo && \
/tmp/install.sh && \
/tmp/post-install.sh && \
## bootc
wget https://copr.fedorainfracloud.org/coprs/rhcontainerbot/bootc/repo/fedora-"${FEDORA_MAJOR_VERSION}"/bootc-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/bootc.repo && \
rpm-ostree install bootc && \
rm -f /etc/yum.repos.d/bootc.repo && \
rm -f /etc/yum.repos.d/_copr_ublue-os_staging.repo && \
rm -f /etc/yum.repos.d/_copr_kylegospo_oversteer.repo && \
rm -rf /tmp/* /var/* && \
if [[ "$IMAGE_NAME" == "base" ]]; then systemctl enable getty@tty1; fi && \
ostree container commit && \
mkdir -p /var/tmp && chmod -R 1777 /var/tmp

Expand Down
2 changes: 1 addition & 1 deletion github-release-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ fi
set -ouex pipefail

API="https://api.github.com/repos/${ORG_PROJ}/releases/latest"
RPM_URLS=$(curl --retry 3 --retry-delay 0 --retry-all-errors -sL ${API} \
RPM_URLS=$(curl --retry 3 --retry-delay 3 --retry-all-errors -sL ${API} \
| jq \
-r \
--arg arch_filter "${ARCH_FILTER}" \
Expand Down
8 changes: 6 additions & 2 deletions packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,9 @@
},
"38": {
"include": {
"all": [],
"all": [
"bootc"
],
"silverblue": [
"raw-thumbnailer"
],
Expand All @@ -271,7 +273,9 @@
},
"39": {
"include": {
"all": [],
"all": [
"bootc"
],
"kinoite": [
"xwaylandvideobridge"
]
Expand Down

0 comments on commit b17b571

Please sign in to comment.