From 070bced17ddaf0f596be62aed3246400bedcab38 Mon Sep 17 00:00:00 2001 From: Bastien Riviere Date: Sun, 10 Nov 2024 12:43:14 +0100 Subject: [PATCH] feat: use latest --- Containerfile | 6 ++---- build.sh | 10 +++++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Containerfile b/Containerfile index 591b490..379aa1c 100644 --- a/Containerfile +++ b/Containerfile @@ -4,8 +4,6 @@ # Build args can be provided on the commandline when building locally with: # podman build -f Containerfile --build-arg FEDORA_MAJOR_VERSION=40 -t local-image -ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-41}" - # SOURCE_IMAGE arg can be anything from ublue upstream which matches your desired version: # See list here: https://github.com/orgs/ublue-os/packages?repo_name=main # - "silverblue" @@ -35,10 +33,10 @@ ARG SOURCE_IMAGE="base" # - stable-zfs # - stable-nvidia-zfs # - (and the above with testing rather than stable) -ARG SOURCE_SUFFIX="-stable" +ARG SOURCE_SUFFIX="-main" ## SOURCE_TAG arg must be a version built for the specific image: eg, 39, 40, gts, latest -ARG SOURCE_TAG="${FEDORA_MAJOR_VERSION}" +ARG SOURCE_TAG="latest" ### 2. SOURCE IMAGE diff --git a/build.sh b/build.sh index e8c6ffb..9854191 100755 --- a/build.sh +++ b/build.sh @@ -7,16 +7,16 @@ RELEASE="$(rpm -E %fedora)" ### Add repos # Add Staging repo -curl -Lo /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo +curl -Lo /etc/yum.repos.d/ublue-os-staging-fedora-"${RELEASE}".repo https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"${RELEASE}"/ublue-os-staging-fedora-"${RELEASE}".repo # Add Bling repo -curl -Lo /etc/yum.repos.d/ublue-os-bling-fedora-"${FEDORA_MAJOR_VERSION}".repo https://copr.fedorainfracloud.org/coprs/ublue-os/bling/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ublue-os-bling-fedora-"${FEDORA_MAJOR_VERSION}".repo +curl -Lo /etc/yum.repos.d/ublue-os-bling-fedora-"${RELEASE}".repo https://copr.fedorainfracloud.org/coprs/ublue-os/bling/repo/fedora-"${RELEASE}"/ublue-os-bling-fedora-"${RELEASE}".repo -curl -Lo /etc/yum.repos.d/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo https://copr.fedorainfracloud.org/coprs/ganto/lxc4/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo +curl -Lo /etc/yum.repos.d/ganto-lxc4-fedora-"${RELEASE}".repo https://copr.fedorainfracloud.org/coprs/ganto/lxc4/repo/fedora-"${RELEASE}"/ganto-lxc4-fedora-"${RELEASE}".repo -curl -Lo /etc/yum.repos.d/_copr_che-nerd-fonts-"${FEDORA_MAJOR_VERSION}".repo https://copr.fedorainfracloud.org/coprs/che/nerd-fonts/repo/fedora-"${FEDORA_MAJOR_VERSION}"/che-nerd-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo +curl -Lo /etc/yum.repos.d/_copr_che-nerd-fonts-"${RELEASE}".repo https://copr.fedorainfracloud.org/coprs/che/nerd-fonts/repo/fedora-"${RELEASE}"/che-nerd-fonts-fedora-"${RELEASE}".repo -curl -Lo /etc/yum.repos.d/_copr_babariviere-tools-"${FEDORA_MAJOR_VERSION}".repo https://copr.fedorainfracloud.org/coprs/babariviere/tools/repo/fedora-"${FEDORA_MAJOR_VERSION}"/babariviere-tools-fedora-"${FEDORA_MAJOR_VERSION}".repo +curl -Lo /etc/yum.repos.d/_copr_babariviere-tools-"${RELEASE}".repo https://copr.fedorainfracloud.org/coprs/babariviere/tools/repo/fedora-"${RELEASE}"/babariviere-tools-fedora-"${RELEASE}".repo curl https://downloads.1password.com/linux/keys/1password.asc | tee /etc/pki/rpm-gpg/1password.gpg