forked from ublue-os/bluefin
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
f449746
commit 8bf12d0
Showing
5 changed files
with
383 additions
and
190 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,189 @@ | ||
| ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-asus}" | ||
| ARG TARGET_BASE="${TARGET_BASE:-bluefin}" | ||
| ARG AKMODS_FLAVOR="${AKMODS_FLAVOR:-asus}" | ||
| ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-silverblue}" | ||
| ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}" | ||
| ARG SOURCE_IMAGE="${SOURCE_IMAGE:-$BASE_IMAGE_NAME-$IMAGE_FLAVOR}" | ||
| ARG BASE_IMAGE="ghcr.io/ublue-os/${SOURCE_IMAGE}" | ||
|
|
||
| ## bluefin image section | ||
| FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS bluefin | ||
|
|
||
| ARG IMAGE_FLAVOR | ||
| ARG AKMODS_FLAVOR | ||
| ARG BASE_IMAGE_NAME | ||
| ARG FEDORA_MAJOR_VERSION | ||
| ARG IMAGE_NAME="${IMAGE_NAME}" | ||
| ARG IMAGE_VENDOR="${IMAGE_VENDOR}" | ||
| ARG PACKAGE_LIST="bluefin" | ||
|
|
||
| COPY etc/yum.repos.d/ /etc/yum.repos.d/ | ||
|
|
||
| # GNOME VRR & Ptyxis | ||
| RUN if [ ${FEDORA_MAJOR_VERSION} -ge "39" ]; then \ | ||
| wget --progress=dot:giga https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/repo/fedora-"${FEDORA_MAJOR_VERSION}"/kylegospo-gnome-vrr-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo && \ | ||
| rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:kylegospo:gnome-vrr mutter mutter-common gnome-control-center gnome-control-center-filesystem && \ | ||
| rm -f /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo && \ | ||
| wget --progress=dot:giga https://copr.fedorainfracloud.org/coprs/kylegospo/prompt/repo/fedora-$(rpm -E %fedora)/kylegospo-prompt-fedora-$(rpm -E %fedora).repo?arch=x86_64 -O /etc/yum.repos.d/_copr_kylegospo-prompt.repo && \ | ||
| rpm-ostree override replace \ | ||
| --experimental \ | ||
| --from repo=copr:copr.fedorainfracloud.org:kylegospo:prompt \ | ||
| vte291 \ | ||
| vte-profile \ | ||
| libadwaita && \ | ||
| rpm-ostree install \ | ||
| ptyxis && \ | ||
| rm -f /etc/yum.repos.d/_copr_kylegospo-prompt.repo && \ | ||
| rpm-ostree override remove \ | ||
| power-profiles-daemon \ | ||
| || true && \ | ||
| rpm-ostree override remove \ | ||
| tlp \ | ||
| tlp-rdw \ | ||
| || true \ | ||
| ; fi | ||
|
|
||
| # Add ublue kmods, add needed negativo17 repo and then immediately disable due to incompatibility with RPMFusion | ||
| COPY --from=ghcr.io/ublue-os/akmods:${AKMODS_FLAVOR}-${FEDORA_MAJOR_VERSION} /rpms /tmp/akmods-rpms | ||
| RUN sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \ | ||
| wget --progress=dot:giga https://negativo17.org/repos/fedora-multimedia.repo -O /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \ | ||
| if [[ "${FEDORA_MAJOR_VERSION}" -ge "39" ]]; then \ | ||
| rpm-ostree install \ | ||
| /tmp/akmods-rpms/kmods/*xpadneo*.rpm \ | ||
| /tmp/akmods-rpms/kmods/*xone*.rpm \ | ||
| /tmp/akmods-rpms/kmods/*openrazer*.rpm \ | ||
| /tmp/akmods-rpms/kmods/*v4l2loopback*.rpm \ | ||
| /tmp/akmods-rpms/kmods/*wl*.rpm \ | ||
| ; fi && \ | ||
| if grep -qv "asus" <<< "${AKMODS_FLAVOR}"; then \ | ||
| rpm-ostree install \ | ||
| /tmp/akmods-rpms/kmods/*evdi*.rpm \ | ||
| ; fi && \ | ||
| sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \ | ||
| wget https://copr.fedorainfracloud.org/coprs/che/nerd-fonts/repo/fedora-"${FEDORA_MAJOR_VERSION}"/che-nerd-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_che-nerd-fonts-"${FEDORA_MAJOR_VERSION}".repo | ||
|
|
||
| # Starship Shell Prompt | ||
| RUN curl -Lo /tmp/starship.tar.gz "https://github.com/starship/starship/releases/latest/download/starship-x86_64-unknown-linux-gnu.tar.gz" && \ | ||
| tar -xzf /tmp/starship.tar.gz -C /tmp && \ | ||
| install -c -m 0755 /tmp/starship /usr/bin && \ | ||
| echo 'eval "$(starship init bash)"' >> /etc/bashrc | ||
|
|
||
| # Copy atuin from bluefin-cli | ||
| COPY --from=ghcr.io/ublue-os/bluefin-cli /usr/bin/atuin /usr/bin/atuin | ||
| COPY --from=ghcr.io/ublue-os/bluefin-cli /usr/share/bash-prexec /usr/share/bash-prexec | ||
|
|
||
| COPY just /tmp/just | ||
| COPY packages.json /tmp/packages.json | ||
| COPY build.sh /tmp/build.sh | ||
| COPY image-info.sh /tmp/image-info.sh | ||
| COPY fetch-quadlets.sh /tmp/fetch-quadlets.sh | ||
| # Copy ublue-update.toml to tmp first, to avoid being overwritten. | ||
| COPY usr/etc/ublue-update/ublue-update.toml /tmp/ublue-update.toml | ||
|
|
||
| RUN wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo && \ | ||
| /tmp/build.sh && \ | ||
| /tmp/image-info.sh && \ | ||
| /tmp/fetch-quadlets.sh && \ | ||
| pip install --prefix=/usr yafti && \ | ||
| pip install --prefix=/usr topgrade && \ | ||
| rpm-ostree install ublue-update && \ | ||
| mkdir -p /usr/etc/flatpak/remotes.d && \ | ||
| wget -q https://dl.flathub.org/repo/flathub.flatpakrepo -P /usr/etc/flatpak/remotes.d && \ | ||
| cp /tmp/ublue-update.toml /usr/etc/ublue-update/ublue-update.toml && \ | ||
| if [[ "${FEDORA_MAJOR_VERSION}" -ge "39" ]]; then \ | ||
| systemctl enable tuned.service \ | ||
| ; fi && \ | ||
| systemctl enable rpm-ostree-countme.service && \ | ||
| systemctl enable tailscaled.service && \ | ||
| systemctl enable dconf-update.service && \ | ||
| systemctl enable ublue-update.timer && \ | ||
| systemctl enable ublue-system-setup.service && \ | ||
| systemctl enable ublue-system-flatpak-manager.service && \ | ||
| systemctl --global enable ublue-user-flatpak-manager.service && \ | ||
| systemctl --global enable ublue-user-setup.service && \ | ||
| fc-cache -f /usr/share/fonts/ubuntu && \ | ||
| fc-cache -f /usr/share/fonts/inter && \ | ||
| find /tmp/just -iname '*.just' -exec printf "\n\n" \; -exec cat {} \; >> /usr/share/ublue-os/just/60-custom.just && \ | ||
| rm -f /etc/yum.repos.d/tailscale.repo && \ | ||
| rm -f /etc/yum.repos.d/charm.repo && \ | ||
| rm -f /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo && \ | ||
| echo "Hidden=true" >> /usr/share/applications/fish.desktop && \ | ||
| echo "Hidden=true" >> /usr/share/applications/htop.desktop && \ | ||
| echo "Hidden=true" >> /usr/share/applications/nvtop.desktop && \ | ||
| echo "Hidden=true" >> /usr/share/applications/gnome-system-monitor.desktop && \ | ||
| rm -f /etc/yum.repos.d/_copr_che-nerd-fonts-"${FEDORA_MAJOR_VERSION}".repo && \ | ||
| sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/user.conf && \ | ||
| sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/system.conf && \ | ||
| sed -i '/^PRETTY_NAME/s/Silverblue/Bluefin/' /usr/lib/os-release | ||
|
|
||
| COPY usr /usr | ||
|
|
||
| RUN rm -rf /tmp/* /var/* && \ | ||
| ostree container commit && \ | ||
| mkdir -p /var/tmp && \ | ||
| chmod -R 1777 /var/tmp | ||
|
|
||
| ## bluefin-dx developer edition image section | ||
| FROM bluefin AS bluefin-dx | ||
|
|
||
| ARG IMAGE_NAME="${IMAGE_NAME}" | ||
| ARG IMAGE_VENDOR="${IMAGE_VENDOR}" | ||
| ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME}" | ||
| ARG IMAGE_FLAVOR="${IMAGE_FLAVOR}" | ||
| ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}" | ||
| ARG PACKAGE_LIST="bluefin-dx" | ||
|
|
||
| # dx specific files come from the dx directory in this repo | ||
| COPY dx/etc/yum.repos.d/ /etc/yum.repos.d/ | ||
|
|
||
| # Apply IP Forwarding before installing Docker to prevent messing with LXC networking | ||
| RUN sysctl -p | ||
|
|
||
| RUN wget https://copr.fedorainfracloud.org/coprs/ganto/lxc4/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo && \ | ||
| wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo && \ | ||
| wget https://copr.fedorainfracloud.org/coprs/karmab/kcli/repo/fedora-"${FEDORA_MAJOR_VERSION}"/karmab-kcli-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/karmab-kcli-fedora-"${FEDORA_MAJOR_VERSION}".repo && \ | ||
| wget https://copr.fedorainfracloud.org/coprs/atim/ubuntu-fonts/repo/fedora-"${FEDORA_MAJOR_VERSION}"/atim-ubuntu-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/atim-ubuntu-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo | ||
|
|
||
| COPY packages.json \ | ||
| build.sh \ | ||
| image-info.sh \ | ||
| /tmp/ | ||
|
|
||
| # Handle packages via packages.json | ||
| RUN /tmp/build.sh && \ | ||
| /tmp/image-info.sh | ||
|
|
||
| RUN wget https://github.com/docker/compose/releases/latest/download/docker-compose-linux-x86_64 -O /tmp/docker-compose && \ | ||
| install -c -m 0755 /tmp/docker-compose /usr/bin | ||
|
|
||
| COPY --from=cgr.dev/chainguard/dive:latest /usr/bin/dive /usr/bin/dive | ||
| COPY --from=cgr.dev/chainguard/flux:latest /usr/bin/flux /usr/bin/flux | ||
| COPY --from=cgr.dev/chainguard/helm:latest /usr/bin/helm /usr/bin/helm | ||
| COPY --from=cgr.dev/chainguard/ko:latest /usr/bin/ko /usr/bin/ko | ||
| COPY --from=cgr.dev/chainguard/minio-client:latest /usr/bin/mc /usr/bin/mc | ||
|
|
||
| # Set up services | ||
| RUN systemctl enable docker.socket && \ | ||
| systemctl enable podman.socket && \ | ||
| systemctl enable swtpm-workaround.service && \ | ||
| systemctl enable bluefin-dx-groups.service && \ | ||
| systemctl enable --global bluefin-dx-user-vscode.service && \ | ||
| systemctl disable pmie.service && \ | ||
| systemctl disable pmlogger.service | ||
|
|
||
| COPY workarounds.sh /tmp | ||
| RUN /tmp/workarounds.sh | ||
|
|
||
| COPY dx/usr /usr | ||
|
|
||
| # Clean up repos, everything is on the image so we don't need them | ||
| RUN rm -f /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION:?}".repo && \ | ||
| rm -f /etc/yum.repos.d/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION:?}".repo && \ | ||
| rm -f /etc/yum.repos.d/karmab-kcli-fedora-"${FEDORA_MAJOR_VERSION:?}".repo && \ | ||
| rm -f /etc/yum.repos.d/atim-ubuntu-fonts-fedora-"${FEDORA_MAJOR_VERSION:?}".repo && \ | ||
| rm -f /etc/yum.repos.d/vscode.repo && \ | ||
| rm -f /etc/yum.repos.d/docker-ce.repo && \ | ||
| rm -f /etc/yum.repos.d/_copr:copr.fedorainfracloud.org:phracek:PyCharm.repo && \ | ||
| rm -f /etc/yum.repos.d/fedora-cisco-openh264.repo && \ | ||
| rm -rf /tmp/* /var/* && \ | ||
| ostree container commit |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| -----BEGIN PUBLIC KEY----- | ||
| MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE7lh7fJMV4dBT2jT1XafixUJa7OVA | ||
| cT+QFVD8IfIJIS/KBAc8hx1aslzkH3tfeM0cwyCLB7kOStZ4sh6RyFQD9w== | ||
| MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEr5AAD7TIqB/CaTsrcYFuV4Uk0SsM | ||
| 5C7ONui8EdY687jnhTVsGDXr4KBDgxizlNKcRFwYmFYYp2PWKpbILupsjA== | ||
| -----END PUBLIC KEY----- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.