Skip to content

Commit ff396f0

Browse files
committed
Lets see if the copr packages are fixed
1 parent 4b07228 commit ff396f0

File tree

2 files changed

+2
-34
lines changed

2 files changed

+2
-34
lines changed

Containerfile

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,41 +5,9 @@ ARG BASE_IMAGE=ghcr.io/ublue-os/bluefin-dx:stable-daily
55
FROM scratch AS ctx
66
COPY build_files /
77

8-
# Build Elephant from source (cached layer)
9-
FROM ${BASE_IMAGE} AS elephant-builder
10-
COPY packages/elephant/build.sh /tmp/build-elephant.sh
11-
RUN --mount=type=cache,dst=/var/cache \
12-
--mount=type=cache,dst=/var/log \
13-
--mount=type=tmpfs,dst=/tmp/build \
14-
chmod +x /tmp/build-elephant.sh && \
15-
/tmp/build-elephant.sh
16-
17-
# Test that Elephant binary works
18-
RUN /usr/bin/elephant --version || /usr/bin/elephant --help || echo "Elephant binary exists and is executable"
19-
20-
# Build Walker from source (cached layer)
21-
FROM ${BASE_IMAGE} AS walker-builder
22-
COPY packages/walker/build.sh /tmp/build-walker.sh
23-
RUN --mount=type=cache,dst=/var/cache \
24-
--mount=type=cache,dst=/var/log \
25-
--mount=type=tmpfs,dst=/tmp/build \
26-
chmod +x /tmp/build-walker.sh && \
27-
/tmp/build-walker.sh
28-
29-
# Test that Walker binary works
30-
RUN /usr/bin/walker --version || /usr/bin/walker --help || echo "Walker binary exists and is executable"
31-
328
# Base Image
339
FROM ${BASE_IMAGE}
3410

35-
# Copy Elephant binary and service from builder
36-
COPY --from=elephant-builder /usr/bin/elephant /usr/bin/elephant
37-
COPY --from=elephant-builder /usr/lib/systemd/user/elephant.service /usr/lib/systemd/user/elephant.service
38-
39-
# Copy Walker binary and resources from builder
40-
COPY --from=walker-builder /usr/bin/walker /usr/bin/walker
41-
COPY --from=walker-builder /usr/share/walker /usr/share/walker
42-
4311
# Copy dot_files into the image at /usr/share/hypercube/config
4412
COPY dot_files /usr/share/hypercube/config
4513

build_files/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ dnf5 -y install fd-find
2121
# TODO: Figure out what we don't need from solopasha/hyprland
2222

2323
# Application Launcher - Walker / Elephant
24-
# These are now built in separate cached layers in the Containerfile
25-
# and copied into the final image for better layer caching
24+
dnf5 -y copr enable errornointernet/packages
25+
dnf5 -y install walker elephant
2626

2727
# On Screen Display
2828
dnf5 -y copr enable markupstart/SwayOSD

0 commit comments

Comments
 (0)