refactor(docker): streamline Zebra configuration handling in entrypoint script

Author: gustavovalverde

docker/Dockerfile

@@ -120,10 +120,6 @@ COPY --from=electriccoinco/lightwalletd:latest /usr/local/bin/lightwalletd /usr/
 # and allow to change permissions for mounted cache directories
 COPY --from=tianon/gosu:bookworm /gosu /usr/local/bin/
 
-# Use the same default config as in the production environment.
-ENV ZEBRA_CONF_PATH="${HOME}/.config/zebrad.toml"
-COPY --chown=${UID}:${GID} ./docker/default-zebra-config.toml ${ZEBRA_CONF_PATH}
-
 # As the build has already run with the root user,
 # we need to set the correct permissions for the home and cargo home dirs owned by it.
 RUN chown -R ${UID}:${GID} "${HOME}" && \
@@ -140,7 +136,9 @@ ENTRYPOINT [ "entrypoint.sh", "test" ]
 # `test` stage. The resulting zebrad binary is used in the `runtime` stage.
 FROM deps AS release
 
+# Set the working directory for the build.
 ARG HOME
+WORKDIR ${HOME}
 
 RUN --mount=type=bind,source=tower-batch-control,target=tower-batch-control \
     --mount=type=bind,source=tower-fallback,target=tower-fallback \
@@ -198,15 +196,8 @@ RUN addgroup --quiet --gid ${GID} ${USER} && \
     adduser --quiet --gid ${GID} --uid ${UID} --home ${HOME} ${USER} --disabled-password --gecos ""
 
 WORKDIR ${HOME}
-
-# We set the default locations of the conf and cache dirs according to the XDG
-# spec: https://specifications.freedesktop.org/basedir-spec/latest/
-
 RUN chown -R ${UID}:${GID} ${HOME}
 
-ARG ZEBRA_CONF_PATH="${HOME}/.config/zebrad.toml"
-ENV ZEBRA_CONF_PATH=${ZEBRA_CONF_PATH}
-
 # We're explicitly NOT using the USER directive here.
 # Instead, we run as root initially and use gosu in the entrypoint.sh
 # to step down to the non-privileged user. This allows us to change permissions
@@ -216,7 +207,6 @@ ENV ZEBRA_CONF_PATH=${ZEBRA_CONF_PATH}
 # Copy the gosu binary to be able to run the entrypoint as non-root user
 COPY --from=tianon/gosu:bookworm /gosu /usr/local/bin/
 COPY --from=release /usr/local/bin/zebrad /usr/local/bin/
-COPY --chown=${UID}:${GID} ./docker/default-zebra-config.toml ${ZEBRA_CONF_PATH}
 COPY --chown=${UID}:${GID} ./docker/entrypoint.sh /usr/local/bin/entrypoint.sh
 
 ENTRYPOINT [ "entrypoint.sh" ]

docker/default-zebra-config.toml

@@ -23,7 +23,7 @@ cache_dir = "/home/zebra/.cache/zebra"
 # listen_addr = "0.0.0.0:8232" # Mainnet
 # listen_addr = "0.0.0.0:18232" # Testnet
 
-cookie_dir = "/home/zebra/.cache/zebra"
+cookie_dir = "/home/zebra/.config/cookie"
 
 # To disable cookie authentication, uncomment the line below and set the value
 # to false.

docker/docker-compose.yml

@@ -1,6 +1,11 @@
 services:
   zebra:
     container_name: zebra
+    build:
+      context: ../
+      dockerfile: docker/Dockerfile
+      target: runtime
+    # user: 10001:10001
     image: zfnd/zebra
     platform: linux/amd64
     restart: unless-stopped
@@ -12,15 +17,12 @@ services:
     env_file:
       - .env
     volumes:
-      - zebrad-cache:/home/zebra/.cache/zebra
+      - zebrad-cache:/home/zebra/.cache/
     # Having `tty` set to true makes Zebra use colored logs.
     tty: true
-    #! Uncomment the `configs` mapping below to make your custom configuration
-    #! take effect.
-    #
-    # configs:
-    #   - source: zebra-config
-    #     target: /home/zebra/.config/zebrad.toml
+    configs:
+      - source: zebra-config
+        target: /home/zebra/.config/zebrad.toml
     #
     # Uncomment the `ports` mapping below to map ports between the container and
     # host.
@@ -35,10 +37,9 @@ services:
 
 configs:
   zebra-config:
-    #! To customize the default configuration, edit this file before starting
+    #! To use a different configuration file, edit this file before starting
     #! the container.
     file: ./default-zebra-config.toml
 
 volumes:
   zebrad-cache:
-    driver: local