Skip to content

Commit 84c446c

Browse files
committed
debug: try to avoid string literal.
1 parent a766a76 commit 84c446c

File tree

2 files changed

+18
-38
lines changed

2 files changed

+18
-38
lines changed

docker/build/movement/Dockerfile

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -45,25 +45,15 @@ RUN chmod +x /app/entry.sh
4545
# Switch to non-root user
4646
USER movement
4747

48-
# Build up runtime PATH from all bin directories in /nix/store
49-
ENV PATH="/nix/store:$(find /nix/store -type d -path '*/bin' | paste -sd: -):$PATH"
50-
51-
# Manually pull the needed images
52-
# TODO: this should be refactored s.t. we can get the list from the movement command. But, probably not in this PR.
53-
# "movement-full-node"
54-
RUN podman pull ghcr.io/movementlabsxyz/movement-full-node:c2372ff
55-
# "movement-celestia-da-light-node"
56-
RUN podman pull ghcr.io/movementlabsxyz/movement-celestia-da-light-node:c2372ff
57-
# "movement-full-node-setup"
58-
RUN podman pull ghcr.io/movementlabsxyz/movement-full-node-setup:c2372ff
59-
# "movement-faucet-service"
60-
RUN podman pull ghcr.io/movementlabsxyz/movement-faucet-service:c2372ff
61-
# "movement-celestia-bridge"
62-
RUN podman pull ghcr.io/movementlabsxyz/movement-celestia-bridge:c2372ff
63-
# "movement-celestia-appd"
64-
RUN podman pull ghcr.io/movementlabsxyz/movement-celestia-appd:c2372ff
65-
# "wait-for-celestia-light-node"
66-
RUN podman pull ghcr.io/movementlabsxyz/wait-for-celestia-light-node:c2372ff
48+
# Dynamically build the PATH from all /nix/store/*/bin directories and use it in this layer
49+
RUN export PATH="$(find /nix/store -type d -path '*/bin' | paste -sd: -):$PATH" && \
50+
podman pull ghcr.io/movementlabsxyz/movement-full-node:c2372ff && \
51+
podman pull ghcr.io/movementlabsxyz/movement-celestia-da-light-node:c2372ff && \
52+
podman pull ghcr.io/movementlabsxyz/movement-full-node-setup:c2372ff && \
53+
podman pull ghcr.io/movementlabsxyz/movement-faucet-service:c2372ff && \
54+
podman pull ghcr.io/movementlabsxyz/movement-celestia-bridge:c2372ff && \
55+
podman pull ghcr.io/movementlabsxyz/movement-celestia-appd:c2372ff && \
56+
podman pull ghcr.io/movementlabsxyz/wait-for-celestia-light-node:c2372ff
6757

6858
# Entrypoint to bootstrap podman and launch movement
6959
ENTRYPOINT ["/app/entry.sh"]

docker/build/mtma/Dockerfile

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -44,25 +44,15 @@ RUN chmod +x /app/entry.sh
4444
# Switch to non-root user
4545
USER mtma
4646

47-
# Build up runtime PATH from all bin directories in /nix/store
48-
ENV PATH="/nix/store:$(find /nix/store -type d -path '*/bin' | paste -sd: -):$PATH"
49-
50-
# Manually pull the needed images
51-
# TODO: this should be refactored s.t. we can get the list from the movement command. But, probably not in this PR.
52-
# "movement-full-node"
53-
RUN podman pull ghcr.io/movementlabsxyz/movement-full-node:c2372ff
54-
# "movement-celestia-da-light-node"
55-
RUN podman pull ghcr.io/movementlabsxyz/movement-celestia-da-light-node:c2372ff
56-
# "movement-full-node-setup"
57-
RUN podman pull ghcr.io/movementlabsxyz/movement-full-node-setup:c2372ff
58-
# "movement-faucet-service"
59-
RUN podman pull ghcr.io/movementlabsxyz/movement-faucet-service:c2372ff
60-
# "movement-celestia-bridge"
61-
RUN podman pull ghcr.io/movementlabsxyz/movement-celestia-bridge:c2372ff
62-
# "movement-celestia-appd"
63-
RUN podman pull ghcr.io/movementlabsxyz/movement-celestia-appd:c2372ff
64-
# "wait-for-celestia-light-node"
65-
RUN podman pull ghcr.io/movementlabsxyz/wait-for-celestia-light-node:c2372ff
47+
# Dynamically build the PATH from all /nix/store/*/bin directories and use it in this layer
48+
RUN export PATH="$(find /nix/store -type d -path '*/bin' | paste -sd: -):$PATH" && \
49+
podman pull ghcr.io/movementlabsxyz/movement-full-node:c2372ff && \
50+
podman pull ghcr.io/movementlabsxyz/movement-celestia-da-light-node:c2372ff && \
51+
podman pull ghcr.io/movementlabsxyz/movement-full-node-setup:c2372ff && \
52+
podman pull ghcr.io/movementlabsxyz/movement-faucet-service:c2372ff && \
53+
podman pull ghcr.io/movementlabsxyz/movement-celestia-bridge:c2372ff && \
54+
podman pull ghcr.io/movementlabsxyz/movement-celestia-appd:c2372ff && \
55+
podman pull ghcr.io/movementlabsxyz/wait-for-celestia-light-node:c2372ff
6656

6757
# Entrypoint to bootstrap podman and launch mtma
6858
ENTRYPOINT ["/app/entry.sh"]

0 commit comments

Comments
 (0)