fix: merge.

Author: l-monninger

docker/build/movement/Dockerfile

@@ -28,9 +28,6 @@ RUN adduser -u 1000 -D -s /bin/bash movement
 COPY --from=builder /tmp/build/target/release/movement /app/movement
 COPY --from=builder /tmp/runtime/nix/store /nix/store
 
-# Set up PATH to include all /nix/store/*/bin dirs
-ENV PATH="/nix/store:$(find /nix/store -type d -path '*/bin' | paste -sd: -):$PATH"
-
 # Environment setup
 ENV PATH="/nix/var/nix/profiles/default/bin:$PATH"
 ENV XDG_RUNTIME_DIR="/run/user/1000"
@@ -48,6 +45,9 @@ RUN chmod +x /app/entry.sh
 # Switch to non-root user
 USER movement
 
+# Build up runtime PATH from all bin directories in /nix/store
+ENV PATH="/nix/store:$(find /nix/store -type d -path '*/bin' | paste -sd: -):$PATH"
+
 # Manually pull the needed images
 # TODO: this should be refactored s.t. we can get the list from the movement command. But, probably not in this PR.
 #   "movement-full-node"

docker/build/mtma/Dockerfile

@@ -27,9 +27,6 @@ RUN adduser -u 1000 -D -s /bin/bash mtma
 COPY --from=builder /tmp/build/target/release/mtma /app/mtma
 COPY --from=builder /tmp/runtime/nix/store /nix/store
 
-# Set up PATH to include all /nix/store/*/bin dirs
-ENV PATH="/nix/store:$(find /nix/store -type d -path '*/bin' | paste -sd: -):$PATH"
-
 # Environment setup
 ENV PATH="/nix/var/nix/profiles/default/bin:$PATH"
 ENV XDG_RUNTIME_DIR="/run/user/1000"
@@ -47,6 +44,9 @@ RUN chmod +x /app/entry.sh
 # Switch to non-root user
 USER mtma
 
+# Build up runtime PATH from all bin directories in /nix/store
+ENV PATH="/nix/store:$(find /nix/store -type d -path '*/bin' | paste -sd: -):$PATH"
+
 # Manually pull the needed images
 # TODO: this should be refactored s.t. we can get the list from the movement command. But, probably not in this PR.
 #   "movement-full-node"

flake.nix

@@ -131,6 +131,7 @@
                 if ! podman machine inspect podman-machine-default &>/dev/null; then
                   echo "Initializing podman machine..."
                   podman machine init
+                  podman machine start
                 elif ! podman machine inspect podman-machine-default --format '{{.State}}' | grep -q 'running'; then
                   echo "Starting podman machine..."
                   podman machine start