sst/uphy-20241229
1
0
Fork 0
Code Releases Packages Activity Actions

chore: use a bash script and simplify Containerfile

Browse source
This commit is contained in:
Benjamin Sherman 2024-04-15 00:20:34 -05:00
parent e19fcff7bf
commit 2c83ac7f21
No known key found for this signature in database
GPG key ID: 24E3D151565CA98B
2 changed files with 35 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Containerfile
View file

@ -43,26 +43,17 @@ ARG FEDORA_VERSION="39"
## this is a standard Containerfile FROM using the build ARGs above to select the right upstream image ## this is a standard Containerfile FROM using the build ARGs above to select the right upstream image
FROM ghcr.io/ublue-os/${SOURCE_IMAGE}${SOURCE_SUFFIX}:${FEDORA_VERSION} FROM ghcr.io/ublue-os/${SOURCE_IMAGE}${SOURCE_SUFFIX}:${FEDORA_VERSION}
#### Installation of static binaries
# static binaries can sometimes by added using a COPY directive like these below.
COPY --from=cgr.dev/chainguard/kubectl:latest /usr/bin/kubectl /usr/bin/kubectl
#COPY --from=docker.io/docker/compose-bin:latest /docker-compose /usr/bin/docker-compose
### 3. MODIFICATIONS ### 3. MODIFICATIONS
## make modifications desired in your image and install packages here, a few examples follow ## make modifications desired in your image and install packages by modifying the build.sh script
## the following RUN directive does all the things required to run "build.sh" as recommended.
#### Install packages, Change System Configuration Files COPY build.sh /tmp/build.sh
# install a package from standard fedora repo or rpmfusion repo
# RPMfusion packages are available by default in ublue main images
# List of rpmfusion packages can be found here:
# https://mirrors.rpmfusion.org/mirrorlist?path=free/fedora/updates/39/x86_64/repoview/index.html&protocol=https&redirect=1
# modify default timeouts on system to prevent slow reboots from services that won't stop
RUN mkdir -p /var/lib/alternatives && \ RUN mkdir -p /var/lib/alternatives && \
rpm-ostree install screen && \ /tmp/build.sh && \
sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/user.conf && \
sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/system.conf && \
ostree container commit ostree container commit
## NOTES:
# NOTE: All RUN commands must end with ostree container commit, see: https://coreos.github.io/rpm-ostree/container/#using-ostree-container-commit # - /var/lib/alternatives is required to prevent failure with some RPM installs
# - All RUN commands must end with ostree container commit
# see: https://coreos.github.io/rpm-ostree/container/#using-ostree-container-commit

27
build.sh Executable file
View file

@ -0,0 +1,27 @@
#!/bin/sh
set -ouex pipefail
RELEASE="$(rpm -E %fedora)"
### Install packages
# Packages can be installed from any enabled yum repo on the image.
# RPMfusion repos are available by default in ublue main images
# List of rpmfusion packages can be found here:
# https://mirrors.rpmfusion.org/mirrorlist?path=free/fedora/updates/39/x86_64/repoview/index.html&protocol=https&redirect=1
# this installs a package from fedora repos
rpm-ostree install screen
# this would install a package from rpmfusion
#RUN rpm-ostree install vlc
#### Change to System Configuration Files
# this example modifies default timeouts to prevent slow reboots from services that won't stop
sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/user.conf
sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/system.conf