Merge branch 'l-monninger/container-help-checks' of https://github.com/movementlabsxyz/movement-migration into l-monninger/container-help-checks

Author: l-monninger

.github/workflows/build-push-containers-all.yml

@@ -53,7 +53,7 @@ jobs:
 
   run-container-checks:
     needs: 
-      - build-push-checked-containers
+      - build-push-checked-manifest
     uses: ./.github/workflows/container-check.yml
     with:
       container_checks: |

docker/build/movement/Dockerfile

@@ -9,15 +9,27 @@ WORKDIR /tmp/build
 # Set build to docker to skip the podman initilization while opening the flake
 ENV BUILD=docker
 
-# Build the Rust application
+RUN nix --extra-experimental-features "nix-command flakes" \
+        develop --command bash -c "mkdir -p  /tmp/executables"
+
+# Copy celestia-appd to /tmp/executables
+RUN nix --extra-experimental-features "nix-command flakes" \
+        develop --command bash -c "cp \$(which podman) /tmp/executables/podman"
+
+        # Build the Rust application
 RUN nix --extra-experimental-features "nix-command flakes" \
         develop .#docker-build --command bash -c "cargo build --release --bin movement"
 
+
 RUN rust_binary="./target/release/movement"; dest_dir="/tmp/runtime"; \
     mkdir -p "$dest_dir"; ldd "$rust_binary" | awk '{print $3}' | \
     grep '^/' | xargs -I {} dirname {} | sort | uniq | xargs -I {} \
     bash -c 'mkdir -p "$0/$1" && rsync -a --copy-links "$1/" "$0/$1/"' "$dest_dir" {}
 
+RUN rust_binary="/tmp/executables/podman"; dest_dir="/tmp/runtime"; \
+    mkdir -p "$dest_dir"; ldd "$rust_binary" | awk '{print $3}' | \
+    grep '^/' | xargs -I {} dirname {} | sort | uniq | xargs -I {} \
+    bash -c 'mkdir -p "$0/$1" && rsync -a --copy-links "$1/" "$0/$1/"' "$dest_dir" {}
 
 FROM alpine:3.22.0
 
@@ -28,7 +40,10 @@ RUN adduser -u 1000 -D -s /bin/bash movement
 
 # Copy binary and runtime deps
 COPY --from=builder /tmp/build/target/release/movement /app/movement
-COPY --from=builder /tmp/runtime/nix/store /nix/store
+COPY --from=builder /nix/store /nix/store
+
+# copy executables
+COPY --from=builder /tmp/executables/podman /usr/local/bin/podman
 
 # Environment setup
 ENV PATH="/nix/var/nix/profiles/default/bin:$PATH"

docker/build/movement/entry.sh

@@ -2,6 +2,12 @@
 
 set -e
 
+echo "Debugging nix store..."
+ls -al /nix-bin/store
+find /nix-bin/store -type d -path '*/bin' | paste -sd: -
+export PATH="/nix-bin/store:$(find /nix-bin/store -type d -path '*/bin' | paste -sd: -):$PATH"
+echo "PATH: $PATH"
+
 # Start Podman machine if not running
 if ! podman machine inspect podman-machine-default --format '{{.State}}' 2>/dev/null | grep -q 'running'; then
     echo "Starting podman machine..."

docker/build/mtma/Dockerfile

@@ -9,15 +9,28 @@ WORKDIR /tmp/build
 # Set build to docker to skip the podman initilization while opening the flake
 ENV BUILD=docker
 
-# Build the Rust application
 RUN nix --extra-experimental-features "nix-command flakes" \
-        develop .#docker-build --command bash -c "cargo build --release -p mtma"
+        develop --command bash -c "mkdir -p  /tmp/executables"
+
+# Copy celestia-appd to /tmp/executables
+RUN nix --extra-experimental-features "nix-command flakes" \
+        develop --command bash -c "cp \$(which podman) /tmp/executables/podman"
+
+        # Build the Rust application
+RUN nix --extra-experimental-features "nix-command flakes" \
+        develop .#docker-build --command bash -c "cargo build --release --bin mtma"
+
 
 RUN rust_binary="./target/release/mtma"; dest_dir="/tmp/runtime"; \
     mkdir -p "$dest_dir"; ldd "$rust_binary" | awk '{print $3}' | \
     grep '^/' | xargs -I {} dirname {} | sort | uniq | xargs -I {} \
     bash -c 'mkdir -p "$0/$1" && rsync -a --copy-links "$1/" "$0/$1/"' "$dest_dir" {}
 
+RUN rust_binary="/tmp/executables/podman"; dest_dir="/tmp/runtime"; \
+    mkdir -p "$dest_dir"; ldd "$rust_binary" | awk '{print $3}' | \
+    grep '^/' | xargs -I {} dirname {} | sort | uniq | xargs -I {} \
+    bash -c 'mkdir -p "$0/$1" && rsync -a --copy-links "$1/" "$0/$1/"' "$dest_dir" {}
+
 FROM alpine:3.22.0
 
 RUN apk add --no-cache bash
@@ -27,7 +40,10 @@ RUN adduser -u 1000 -D -s /bin/bash mtma
 
 # Copy binary and runtime deps
 COPY --from=builder /tmp/build/target/release/mtma /app/mtma
-COPY --from=builder /tmp/runtime/nix/store /nix/store
+COPY --from=builder /nix/store /nix/store
+
+# copy executables
+COPY --from=builder /tmp/executables/podman /usr/local/bin/podman
 
 # Environment setup
 ENV PATH="/nix/var/nix/profiles/default/bin:$PATH"

docker/build/mtma/entry.sh

@@ -2,6 +2,12 @@
 
 set -e
 
+echo "Debugging nix store..."
+ls -al /nix-bin/store
+find /nix-bin/store -type d -path '*/bin' | paste -sd: -
+export PATH="/nix-bin/store:$(find /nix-bin/store -type d -path '*/bin' | paste -sd: -):$PATH"
+echo "PATH: $PATH"
+
 # Start Podman machine if not running
 if ! podman machine inspect podman-machine-default --format '{{.State}}' 2>/dev/null | grep -q 'running'; then
     echo "Starting podman machine..."