Skip to content

Commit cb615f6

Browse files
eseikeralexiri
authored andcommitted
aarch64 fallback for GNOME workstation
remove optional groups from GNOME aarch64
1 parent 1db14cc commit cb615f6

3 files changed

Lines changed: 20 additions & 3 deletions

File tree

.github/actions/config/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ runs:
5656
REGISTRY_USER="almalinuxorg+airibarr_bot"
5757
IMAGE_PATH="almalinuxorg"
5858
IMAGE_NAME="atomic-desktop"
59-
PLATFORMS="amd64,amd64/v2"
59+
PLATFORMS="arm64,amd64,amd64/v2"
6060
VARIANTS="gnome,kde"
6161
6262
echo "REGISTRY=${REGISTRY}" >> $GITHUB_OUTPUT

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ FROM quay.io/almalinuxorg/almalinux-bootc:10@sha256:33cdd2cd472e007b7e14c8d534de
1212
ARG IMAGE_NAME
1313
ARG IMAGE_REGISTRY
1414
ARG VARIANT
15+
ARG TARGETARCH
1516

1617
RUN --mount=type=tmpfs,dst=/opt \
1718
--mount=type=tmpfs,dst=/tmp \

files/scripts/20-desktop.sh

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,24 @@
33
set -xeuo pipefail
44

55
if [[ "${VARIANT}" == "gnome" ]]; then
6-
dnf install -y \
7-
@"Workstation"
6+
# aarch64 doesn't have @workstation group
7+
if [[ "${TARGETARCH}" == "arm64" ]]; then
8+
dnf install -y \
9+
@core \
10+
@fonts \
11+
@gnome-desktop \
12+
@guest-desktop-agents \
13+
@hardware-support \
14+
@internet-browser \
15+
@multimedia \
16+
@networkmanager-submodules \
17+
@print-client \
18+
@standard \
19+
@workstation-product
20+
else
21+
dnf install -y \
22+
@"Workstation"
23+
fi
824

925
systemctl enable gdm
1026

0 commit comments

Comments
 (0)