Skip to content

Commit 316701e

Browse files
committed
Add variant support
1 parent dc02c86 commit 316701e

File tree

3 files changed

+11
-0
lines changed

3 files changed

+11
-0
lines changed

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ FROM quay.io/almalinuxorg/atomic-desktop-gnome:10@sha256:e3b4f9d5575ffef3cbbfc9b
1010

1111
ARG IMAGE_NAME
1212
ARG IMAGE_REGISTRY
13+
ARG VARIANT
1314

1415
RUN --mount=type=tmpfs,dst=/opt \
1516
--mount=type=tmpfs,dst=/tmp \

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ PODMAN = $(SUDO) podman
33

44
IMAGE_NAME ?= localhost/myimage
55
CONTAINER_FILE ?= ./Dockerfile
6+
VARIANT ?=
67
IMAGE_CONFIG ?= ./iso.toml
78

89
IMAGE_TYPE ?= iso
@@ -22,6 +23,7 @@ image:
2223
--device /dev/fuse \
2324
--build-arg IMAGE_NAME=$(IMAGE_NAME) \
2425
--build-arg IMAGE_REGISTRY=localhost \
26+
--build-arg VARIANT=$(VARIANT) \
2527
-t $(IMAGE_NAME) \
2628
-f $(CONTAINER_FILE) \
2729
.

files/scripts/10-base.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,11 @@ set -xeuo pipefail
66

77
dnf install -y 'dnf-command(config-manager)'
88
dnf config-manager --set-enabled crb
9+
10+
if [[ "${VARIANT}" == "gnome" ]]; then
11+
echo "Installing gnome"
12+
elif [[ "${VARIANT}" == "kde" ]]; then
13+
echo "Installing kde"
14+
else
15+
echo "Neutral variant"
16+
fi

0 commit comments

Comments
 (0)