File tree Expand file tree Collapse file tree 3 files changed +9
-8
lines changed Expand file tree Collapse file tree 3 files changed +9
-8
lines changed Original file line number Diff line number Diff line change @@ -28,10 +28,6 @@ RUN adduser -u 1000 -D -s /bin/bash movement
28
28
COPY --from=builder /tmp/build/target/release/movement /app/movement
29
29
COPY --from=builder /tmp/runtime/nix/store /nix/store
30
30
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
-
35
31
# Environment setup
36
32
ENV PATH="/nix/var/nix/profiles/default/bin:$PATH"
37
33
ENV XDG_RUNTIME_DIR="/run/user/1000"
@@ -49,6 +45,10 @@ RUN chmod +x /app/entry.sh
49
45
# Switch to non-root user
50
46
USER movement
51
47
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
+
52
52
# Manually pull the needed images
53
53
# TODO: this should be refactored s.t. we can get the list from the movement command. But, probably not in this PR.
54
54
# "movement-full-node"
Original file line number Diff line number Diff line change @@ -27,10 +27,6 @@ RUN adduser -u 1000 -D -s /bin/bash mtma
27
27
COPY --from=builder /tmp/build/target/release/mtma /app/mtma
28
28
COPY --from=builder /tmp/runtime/nix/store /nix/store
29
29
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
-
34
30
# Environment setup
35
31
ENV PATH="/nix/var/nix/profiles/default/bin:$PATH"
36
32
ENV XDG_RUNTIME_DIR="/run/user/1000"
@@ -48,6 +44,10 @@ RUN chmod +x /app/entry.sh
48
44
# Switch to non-root user
49
45
USER mtma
50
46
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
+
51
51
# Manually pull the needed images
52
52
# TODO: this should be refactored s.t. we can get the list from the movement command. But, probably not in this PR.
53
53
# "movement-full-node"
Original file line number Diff line number Diff line change 131
131
if ! podman machine inspect podman-machine-default &>/dev/null; then
132
132
echo "Initializing podman machine..."
133
133
podman machine init
134
+ podman machine start
134
135
elif ! podman machine inspect podman-machine-default --format '{{.State}}' | grep -q 'running'; then
135
136
echo "Starting podman machine..."
136
137
podman machine start
You can’t perform that action at this time.
0 commit comments