chore: cleanup Containerfile args & comments
This commit is contained in:
parent
7fb4265c3b
commit
78a2e68421
1 changed files with 38 additions and 19 deletions
|
@ -1,28 +1,47 @@
|
||||||
### 1. BUILD ARGS
|
## 1. BUILD ARGS
|
||||||
## These enable the produced image to be different by passing different build args.
|
# These allow changing the produced image by passing different build args to adjust
|
||||||
## They are provided on the commandline when building in a terminal, but the github
|
# the source from which your image is built.
|
||||||
## workflow provides them when building in Github Actions. Changes to the workflow
|
# Build args can be provided on the commandline when building locally with:
|
||||||
## build.yml will override changes here.
|
# podman build -f Containerfile --build-arg FEDORA_VERSION=40 -t local-image
|
||||||
|
|
||||||
## SOURCE_IMAGE arg can be anything from ublue upstream: silverblue, kinoite, sericea, base
|
# 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"
|
||||||
|
# - "kinoite"
|
||||||
|
# - "sericea"
|
||||||
|
# - "onyx"
|
||||||
|
# - "lazurite"
|
||||||
|
# - "vauxite"
|
||||||
|
# - "base"
|
||||||
|
#
|
||||||
|
# "aurora", "bazzite", "bluefin" or "ucore" may also be used but have different suffixes.
|
||||||
ARG SOURCE_IMAGE="silverblue"
|
ARG SOURCE_IMAGE="silverblue"
|
||||||
|
|
||||||
## SOURCE_SUFFIX arg should be "main", nvidia users should use "nvidia"
|
## SOURCE_SUFFIX arg should include a hyphen and the appropriate suffix name
|
||||||
ARG SOURCE_SUFFIX="main"
|
# These examples all work for silverblue/kinoite/sericea/onyx/lazurite/vauxite/base
|
||||||
|
# - "-main"
|
||||||
|
# - "-nvidia"
|
||||||
|
# - "-asus"
|
||||||
|
# - "-asus-nvidia"
|
||||||
|
# - "-surface"
|
||||||
|
# - "-surface-nvidia"
|
||||||
|
#
|
||||||
|
# aurora, bazzite and bluefin each have unique suffixes. Please check the specific image.
|
||||||
|
# ucore has the following possible suffixes
|
||||||
|
# - stable
|
||||||
|
# - stable-nvidia
|
||||||
|
# - stable-zfs
|
||||||
|
# - stable-nvidia-zfs
|
||||||
|
# - (and the above with testing rather than stable)
|
||||||
|
ARG SOURCE_SUFFIX="-main"
|
||||||
|
|
||||||
## FEDORA_VERSION arg must be a version built by ublue: 37 or 38 as of today
|
## FEDORA_VERSION arg must be a version built by ublue: eg, 39 or 40
|
||||||
ARG FEDORA_VERSION="39"
|
ARG FEDORA_VERSION="39"
|
||||||
|
|
||||||
## NVIDIA_VERSION should only be changed if the user needs a specific nvidia driver version
|
|
||||||
## This will depend on your hardware and the version of the driver that supports it.
|
|
||||||
## if needing driver 470, this should be set to "-470". It is important to include the hyphen
|
|
||||||
ARG NVIDIA_VERSION=""
|
|
||||||
|
|
||||||
|
|
||||||
### 2. SOURCE IMAGE
|
### 2. SOURCE IMAGE
|
||||||
## 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}${NVIDIA_VERSION}
|
FROM ghcr.io/ublue-os/${SOURCE_IMAGE}${SOURCE_SUFFIX}:${FEDORA_VERSION}
|
||||||
|
|
||||||
|
|
||||||
### 3. PRE-MODIFICATIONS
|
### 3. PRE-MODIFICATIONS
|
||||||
|
@ -42,14 +61,14 @@ RUN mkdir -p /var/lib/alternatives
|
||||||
# List of rpmfusion packages can be found here:
|
# 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
|
# https://mirrors.rpmfusion.org/mirrorlist?path=free/fedora/updates/39/x86_64/repoview/index.html&protocol=https&redirect=1
|
||||||
RUN rpm-ostree install screen
|
RUN rpm-ostree install screen
|
||||||
# exmaple package from rpmfusion
|
# example package from rpmfusion
|
||||||
RUN rpm-ostree install vlc
|
#RUN rpm-ostree install vlc
|
||||||
|
|
||||||
#### Installation of static binaries
|
#### Installation of static binaries
|
||||||
|
|
||||||
# static binaries can sometimes by added using a COPY directive like these below.
|
# 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=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
|
#COPY --from=docker.io/docker/compose-bin:latest /docker-compose /usr/bin/docker-compose
|
||||||
|
|
||||||
#### Change to System Configuration Files
|
#### Change to System Configuration Files
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue