Skip to content

Commit 29e8e82

Browse files
committed
fix: bad build.
1 parent 95f92c4 commit 29e8e82

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

docker/build/movement/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ RUN adduser -u 1000 -D -s /bin/bash movement
2828
COPY --from=builder /tmp/build/target/release/movement /app/movement
2929
COPY --from=builder /tmp/runtime/nix/store /nix/store
3030

31-
# Build up runtime PATH from all bin directories in /nix/store
32-
RUN echo "export PATH=$(find /nix/store -type d -path '*/bin' | paste -sd: -):\$PATH" >> /etc/profile.d/nix-path.sh
33-
ENV PATH="/nix/store:$(find /nix/store -type d -path '*/bin' | paste -sd: -):$PATH"
34-
3531
# Environment setup
3632
ENV PATH="/nix/var/nix/profiles/default/bin:$PATH"
3733
ENV XDG_RUNTIME_DIR="/run/user/1000"
@@ -49,6 +45,10 @@ RUN chmod +x /app/entry.sh
4945
# Switch to non-root user
5046
USER movement
5147

48+
# Build up runtime PATH from all bin directories in /nix/store
49+
RUN echo "export PATH=$(find /nix/store -type d -path '*/bin' | paste -sd: -):\$PATH" >> /etc/profile.d/nix-path.sh
50+
ENV PATH="/nix/store:$(find /nix/store -type d -path '*/bin' | paste -sd: -):$PATH"
51+
5252
# Manually pull the needed images
5353
# TODO: this should be refactored s.t. we can get the list from the movement command. But, probably not in this PR.
5454
# "movement-full-node"

docker/build/mtma/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ RUN adduser -u 1000 -D -s /bin/bash mtma
2727
COPY --from=builder /tmp/build/target/release/mtma /app/mtma
2828
COPY --from=builder /tmp/runtime/nix/store /nix/store
2929

30-
# Build up runtime PATH from all bin directories in /nix/store
31-
RUN echo "export PATH=$(find /nix/store -type d -path '*/bin' | paste -sd: -):\$PATH" >> /etc/profile.d/nix-path.sh
32-
ENV PATH="/nix/store:$(find /nix/store -type d -path '*/bin' | paste -sd: -):$PATH"
33-
3430
# Environment setup
3531
ENV PATH="/nix/var/nix/profiles/default/bin:$PATH"
3632
ENV XDG_RUNTIME_DIR="/run/user/1000"
@@ -48,6 +44,10 @@ RUN chmod +x /app/entry.sh
4844
# Switch to non-root user
4945
USER mtma
5046

47+
# Build up runtime PATH from all bin directories in /nix/store
48+
RUN echo "export PATH=$(find /nix/store -type d -path '*/bin' | paste -sd: -):\$PATH" >> /etc/profile.d/nix-path.sh
49+
ENV PATH="/nix/store:$(find /nix/store -type d -path '*/bin' | paste -sd: -):$PATH"
50+
5151
# Manually pull the needed images
5252
# TODO: this should be refactored s.t. we can get the list from the movement command. But, probably not in this PR.
5353
# "movement-full-node"

flake.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@
131131
if ! podman machine inspect podman-machine-default &>/dev/null; then
132132
echo "Initializing podman machine..."
133133
podman machine init
134+
podman machine start
134135
elif ! podman machine inspect podman-machine-default --format '{{.State}}' | grep -q 'running'; then
135136
echo "Starting podman machine..."
136137
podman machine start

0 commit comments

Comments
 (0)