Compare commits

...

4 commits

2 changed files with 29 additions and 9 deletions

View file

@ -4,8 +4,6 @@
# Build args can be provided on the commandline when building locally with: # 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 # podman build -f Containerfile --build-arg FEDORA_MAJOR_VERSION=40 -t local-image
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
# SOURCE_IMAGE arg can be anything from ublue upstream which matches your desired version: # 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 # See list here: https://github.com/orgs/ublue-os/packages?repo_name=main
# - "silverblue" # - "silverblue"
@ -38,7 +36,7 @@ ARG SOURCE_IMAGE="base"
ARG SOURCE_SUFFIX="-main" ARG SOURCE_SUFFIX="-main"
## SOURCE_TAG arg must be a version built for the specific image: eg, 39, 40, gts, latest ## 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 ### 2. SOURCE IMAGE

View file

@ -7,16 +7,16 @@ RELEASE="$(rpm -E %fedora)"
### Add repos ### Add repos
# Add Staging repo # 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 # 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 curl https://downloads.1password.com/linux/keys/1password.asc | tee /etc/pki/rpm-gpg/1password.gpg
@ -44,13 +44,35 @@ pip install --prefix=/usr topgrade
# Installed via flatpak # Installed via flatpak
rpm-ostree override remove firefox firefox-langpacks rpm-ostree override remove firefox firefox-langpacks
#### Quadlets
curl -Lo /etc/containers/systemd/users/azure-cli.container https://raw.githubusercontent.com/babariviere/toolboxes/main/quadlets/azure-cli/azure-cli.container
sed -i 's/ContainerName=azure/ContainerName=azure-cli/' /etc/containers/systemd/users/azure-cli.container
# Make systemd targets
mkdir -p /usr/lib/systemd/user
QUADLET_TARGETS=(
"azure-cli"
)
for i in "${QUADLET_TARGETS[@]}"
do
cat > "/usr/lib/systemd/user/${i}.target" <<EOF
[Unit]
Description=${i}"target for ${i} quadlet
[Install]
WantedBy=default.target
EOF
#### Services #### Services
# systemctl enable docker.socket # systemctl enable docker.socket
systemctl enable podman.socket systemctl enable podman.socket
systemctl enable tailscaled.service systemctl enable podman-auto-update.timer
# systemctl enable tailscaled.service
systemctl enable -f --global flatpak-setup.service systemctl enable -f --global flatpak-setup.service
systemctl enable -f --global azure-topgrade.service systemctl enable -f --global azure-topgrade.service
systemctl enable -f --global azure-cli.container
systemctl enable azure-system-setup.service systemctl enable azure-system-setup.service
systemctl enable azure-groups.service systemctl enable azure-groups.service