diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3f08f915..c490f45a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,7 @@ jobs: strategy: fail-fast: false matrix: - image_name: [silverblue, kinoite, vauxite, sericea, base] + image_name: [silverblue, kinoite, vauxite, sericea, base, lxqt] major_version: [37, 38] include: - major_version: 37 @@ -50,6 +50,11 @@ jobs: - name: Matrix Variables run: | + if [[ "${{ matrix.image_name }}" == "lxqt" ]]; then + echo "SOURCE_IMAGE=base" >> $GITHUB_ENV + else + echo "SOURCE_IMAGE=${{ matrix.image_name }}" >> $GITHUB_ENV + fi echo "IMAGE_NAME=${{ format('{0}-{1}', matrix.image_name, env.IMAGE_BASE_NAME) }}" >> $GITHUB_ENV - name: Generate tags @@ -119,6 +124,7 @@ jobs: ${{ steps.generate-tags.outputs.alias_tags }} build-args: | IMAGE_NAME=${{ matrix.image_name }} + SOURCE_IMAGE=${{ env.SOURCE_IMAGE }} FEDORA_MAJOR_VERSION=${{ matrix.major_version }} labels: ${{ steps.meta.outputs.labels }} oci: false diff --git a/Containerfile b/Containerfile index 921bf1fc..38e6d117 100644 --- a/Containerfile +++ b/Containerfile @@ -1,5 +1,6 @@ ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}" -ARG BASE_IMAGE="quay.io/fedora-ostree-desktops/${IMAGE_NAME}" +ARG SOURCE_IMAGE="${SOURCE_IMAGE:-silverblue}" +ARG BASE_IMAGE="quay.io/fedora-ostree-desktops/${SOURCE_IMAGE}" ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-37}" FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS builder @@ -15,6 +16,6 @@ COPY --from=ghcr.io/ublue-os/config:latest /rpms /tmp/rpms RUN /tmp/build.sh RUN /tmp/post-install.sh -RUN rm -rf /tmp/* +RUN rm -rf /tmp/* /var/* RUN ostree container commit RUN mkdir -p /var/tmp && chmod -R 1777 /var/tmp diff --git a/packages.json b/packages.json index a161d993..66e8b234 100644 --- a/packages.json +++ b/packages.json @@ -14,6 +14,42 @@ ], "silverblue": [ "gnome-tweaks" + ], + "lxqt": [ + "breeze-cursor-theme", + "breeze-gtk", + "breeze-icon-theme", + "falkon", + "firewall-config", + "initial-setup-gui", + "libqtxdg", + "lxqt-about", + "lxqt-archiver", + "lxqt-config", + "lxqt-globalkeys", + "lxqt-notificationd", + "lxqt-openssh-askpass", + "lxqt-panel", + "lxqt-policykit", + "lxqt-powermanagement", + "lxqt-qtplugin", + "lxqt-runner", + "lxqt-session", + "lxqt-themes", + "lxqt-themes-fedora", + "network-manager-applet", + "nm-connection-editor", + "notification-daemon", + "obconf", + "openbox", + "pcmanfm-qt", + "perl-File-MimeInfo", + "qterminal", + "sddm", + "sddm-themes", + "upower", + "xdg-desktop-portal-kde", + "xdg-user-dirs" ] }, "exclude": {