Skip to content

Commit

Permalink
add build args
Browse files Browse the repository at this point in the history
  • Loading branch information
m2Giles committed Oct 29, 2023
1 parent 38fedfd commit b7e2a2a
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ jobs:
build-args: |
IMAGE_NAME=${{ env.IMAGE_NAME }}
IMAGE_VENDOR=${{ steps.registry_case.outputs.lowercase }}
IMAGE_FLAVOR=${{ env.IMAGE_FLAVOR }}
FEDORA_MAJOR_VERSION=${{ env.IMAGE_MAJOR_VERSION }}
IMAGE_MAJOR_VERSION=${{ env.IMAGE_MAJOR_VERSION }}
BASE_IMAGE_URL=${{ env.BASE_IMAGE_URL }}
Expand Down
10 changes: 8 additions & 2 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,14 @@
# does nothing if the image is built in the cloud.

# !! Warning: changing these might not do anything for you. Read comment above.
ARG IMAGE_MAJOR_VERSION=38
ARG BASE_IMAGE_URL=ghcr.io/ublue-os/silverblue-main
ARG IMAGE_MAJOR_VERSION="${IMAGE_MAJOR_VERSION:-38}"
ARG BASE_IMAGE_URL="${BASE_IMAGE_URL:-ghcr.io/ublue-os/silverblue-main}"

ARG IMAGE_NAME="${IMAGE_NAME}"
ARG IMAGE_VENDOR="${IMAGE_VENDOR}"
ARG IMAGE_FLAVOR="${IMAGE_FLAVOR}"
ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"

FROM ${BASE_IMAGE_URL}:${IMAGE_MAJOR_VERSION}

Expand Down
4 changes: 4 additions & 0 deletions config/module_config/packages.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
type: rpm-ostree
repos:
- https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-%OS_VERSION%/ublue-os-staging-fedora-%OS_VERSION%.repo
- https://copr.fedorainfracloud.org/coprs/atim/starship/repo/fedora-%OS_VERSION%/atim-starship-fedora-%OS_VERSION%.repo
- https://copr.fedorainfracloud.org/coprs/ublue-os/distrobox-git/repo/fedora-%OS_VERSION%/ublue-os-distrobox-git-fedora-%OS_VERSION%.repo
install:
# GNOME Extensions
- gnome-shell-extension-appindicator
- gnome-shell-extension-blur-my-shell
- gnome-shell-extension-caffeine
- gnome-shell-extension-just-perfection
- gnome-shell-extension-tailscale-status
# GTK-Theme
- gnome-themes-extra
# Podman
- podman-plugins
- podman-tui
# Utils
- dbus-x11
- distrobox-git
- git-credential-libsecret
- iotop
- libxcrypt-compat
Expand Down

0 comments on commit b7e2a2a

Please sign in to comment.