Skip to content

Commit ea20092

Browse files
authored
feat: switch FROM bluefin to aurorafin-shared (#205)
1 parent 56c2292 commit ea20092

4 files changed

Lines changed: 23 additions & 8 deletions

File tree

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "branding"]
22
path = branding
33
url = https://github.com/get-aurora-dev/branding.git
4+
[submodule "aurorafin-shared"]
5+
path = aurorafin-shared
6+
url = https://github.com/ublue-os/aurorafin-shared.git

Containerfile

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM docker.io/library/alpine:latest AS builder
22

3-
RUN apk add --no-cache curl jq zstd tar coreutils imagemagick rsvg-convert
3+
RUN apk add --no-cache curl jq zstd tar coreutils imagemagick rsvg-convert just
44

55
COPY --from=ghcr.io/ublue-os/aurora-wallpapers:latest@sha256:270b3b10cd6fd54e322407275e24b86655c2472738186b1a825786ce26d4ce50 / /wallpapers
66

@@ -79,11 +79,21 @@ RUN set -xeuo pipefail && \
7979
cp -r /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/ /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents && \
8080
cp -r /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/layouts /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents
8181

82-
FROM ghcr.io/projectbluefin/common@sha256:0c0f1c7d97075431e303d8ef6b368649ff8866b05a6a6b40f439d47d1f098a4c AS bluefin
82+
RUN install -d /out/system_files/shared/usr/share/bash-completion/completions /out/system_files/shared/usr/share/zsh/site-functions /out/system_files/shared/usr/share/fish/vendor_completions.d/ && \
83+
just --completions bash | sed -E 's/([\(_" ])just/\1ujust/g' > /out/system_files/shared/usr/share/bash-completion/completions/ujust && \
84+
just --completions zsh | sed -E 's/([\(_" ])just/\1ujust/g' > /out/system_files/shared/usr/share/zsh/site-functions/_ujust && \
85+
just --completions fish | sed -E 's/([\(_" ])just/\1ujust/g' > /out/system_files/shared/usr/share/fish/vendor_completions.d/ujust.fish
86+
87+
# FIXME: Renovate
88+
RUN curl -fsSLo - https://codeberg.org/fabiscafe/game-devices-udev/archive/1.0.tar.gz | tar xzvf - -C tmp/ && \
89+
for f in tmp/game-devices-udev/src/*.rules; do \
90+
install -Dpm0644 "$f" "out/system_files/shared/usr/lib/udev/rules.d/71-${f##*/}"; \
91+
done && \
92+
curl -fsSLo /out/system_files/shared/usr/lib/udev/rules.d/70-u2f.rules https://raw.githubusercontent.com/Yubico/libfido2/refs/heads/main/udev/70-u2f.rules
8393

8494
FROM scratch AS ctx
85-
COPY --from=bluefin /system_files/shared /system_files/shared
86-
COPY --from=bluefin /system_files/nvidia /system_files/nvidia
95+
COPY aurorafin-shared/system_files/shared /system_files/shared
96+
COPY aurorafin-shared/system_files/nvidia /system_files/nvidia
8797
COPY --from=builder /out/wallpapers /wallpapers
8898
COPY --from=builder /out/logos /logos
8999
COPY --from=builder /out/system_files/shared /system_files/shared

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# aurora-common
22

3-
Shared OCI layer containing configuration files for Aurora and Aurora-DX variants.
3+
Shared OCI layer containing configuration files for https://github.com/ublue-os/aurora.
44

5-
## Repository Structure
6-
7-
This layer builds on top of `ghcr.io/projectbluefin/common` and `https://github.com/get-aurora-dev/branding` which includes:
5+
This repo builds on top of:
6+
- https://github.com/ublue-os/aurorafin-shared
7+
- https://github.com/get-aurora-dev/branding
8+
- https://github.com/ublue-os/artwork
89

910
- `system_files/shared/` - Configuration shared between Aurora and Aurora-DX
1011
- `system_files/dx/` - Aurora-DX specific configuration

aurorafin-shared

Submodule aurorafin-shared added at afaa14c

0 commit comments

Comments
 (0)