Move walker and elephant back to container layers

Author: binarypie

Containerfile

@@ -14,6 +14,9 @@ RUN --mount=type=cache,dst=/var/cache \
   chmod +x /tmp/build-elephant.sh && \
   /tmp/build-elephant.sh
 
+# Test that Elephant binary works
+RUN /usr/bin/elephant --version || /usr/bin/elephant --help || echo "Elephant binary exists and is executable"
+
 # Build Walker from source (cached layer)
 FROM ${BASE_IMAGE} AS walker-builder
 COPY packages/walker/build.sh /tmp/build-walker.sh
@@ -23,6 +26,9 @@ RUN --mount=type=cache,dst=/var/cache \
   chmod +x /tmp/build-walker.sh && \
   /tmp/build-walker.sh
 
+# Test that Walker binary works
+RUN /usr/bin/walker --version || /usr/bin/walker --help || echo "Walker binary exists and is executable"
+
 # Base Image
 FROM ${BASE_IMAGE}
 

build_files/build.sh

@@ -21,96 +21,8 @@ dnf5 -y install fd-find
 # TODO: Figure out what we don't need from solopasha/hyprland
 
 # Application Launcher - Walker / Elephant
-# Build from source in this layer to save disk space
-
-# Build Elephant (Go-based)
-echo "Building Elephant..."
-dnf5 -y install git golang protobuf-compiler
-
-# Clone Elephant repository
-ELEPHANT_VERSION="v2.15.0"
-git clone --depth 1 --branch ${ELEPHANT_VERSION} https://github.com/abenz1267/elephant.git /tmp/elephant
-
-cd /tmp/elephant
-
-# Set Go environment variables for build
-export GOPATH=/tmp/go
-export GOCACHE=/tmp/go-cache
-export GOTOOLCHAIN=auto
-export GOSUMDB=sum.golang.org
-
-# Build Elephant
-cd cmd/elephant
-go build -o elephant elephant.go
-
-# Install binary
-install -Dm755 elephant /usr/bin/elephant
-
-# Create systemd user service directory
-mkdir -p /usr/lib/systemd/user
-
-# Create systemd service file
-cat > /usr/lib/systemd/user/elephant.service << 'EOF'
-[Unit]
-Description=Elephant Data Provider Service
-After=graphical-session.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/elephant
-Restart=on-failure
-RestartSec=5
-
-[Install]
-WantedBy=default.target
-EOF
-
-# Clean up Elephant build
-cd /
-rm -rf /tmp/elephant /tmp/go /tmp/go-cache
-
-echo "Elephant build complete."
-
-# Build Walker (Rust-based with GTK4)
-echo "Building Walker..."
-dnf5 -y install rust cargo gtk4-devel gtk4-layer-shell-devel cairo-devel poppler-glib-devel
-
-# Clone Walker repository
-WALKER_VERSION="v2.10.0"
-git clone --depth 1 --branch ${WALKER_VERSION} https://github.com/abenz1267/walker.git /tmp/walker
-
-cd /tmp/walker
-
-# Set Cargo environment variables for build
-export CARGO_HOME=/tmp/cargo
-export CARGO_TARGET_DIR=/tmp/cargo-target
-
-# Build Walker with release optimizations
-cargo build --release
-
-# Install binary
-install -Dm755 /tmp/cargo-target/release/walker /usr/bin/walker
-
-# Install desktop file if it exists
-if [ -f resources/walker.desktop ]; then
-    install -Dm644 resources/walker.desktop /usr/share/applications/walker.desktop
-fi
-
-# Install default resources
-mkdir -p /usr/share/walker
-if [ -d resources ]; then
-    cp -r resources/* /usr/share/walker/ || true
-fi
-
-# Clean up Walker build
-cd /
-rm -rf /tmp/walker /tmp/cargo /tmp/cargo-target
-
-# Remove build dependencies to keep layer small
-dnf5 -y remove golang rust cargo protobuf-compiler
-dnf5 -y clean all
-
-echo "Walker build complete."
+# These are now built in separate cached layers in the Containerfile
+# and copied into the final image for better layer caching
 
 # On Screen Display
 dnf5 -y copr enable markupstart/SwayOSD