chore: reduce diff

Author: gustavovalverde

docker/Dockerfile

@@ -23,7 +23,7 @@ ARG UID=10001
 ARG GID=${UID}
 ARG USER="zebra"
 ARG HOME="/home/${USER}"
-ARG CARGO_HOME="${HOME}/.cargo/"
+ARG CARGO_HOME="${HOME}/.cargo"
 
 # This stage prepares Zebra's build deps and captures build args as env vars.
 FROM rust:${RUST_VERSION}-bookworm AS deps
@@ -123,8 +123,8 @@ COPY --from=tianon/gosu:bookworm /gosu /usr/local/bin/
 ENV ZEBRA_CONF_PATH="${HOME}/.config/zebrad.toml"
 COPY --chown=${UID}:${GID} ./docker/default-zebra-config.toml ${ZEBRA_CONF_PATH}
 
-# As tests are run as the non-root user, we need to set the correct permissions
-# for the cargo home dir.
+# As the build has already run as root user, we need to set the correct permissions
+# for the home and cargo home dirs owned by root.
 RUN chown -R ${UID}:${GID} "${HOME}" && \
     chown -R ${UID}:${GID} "${CARGO_HOME}"
 

docker/entrypoint.sh

@@ -56,9 +56,9 @@ prepare_conf_file() {
 
   # Set a custom state, network and cookie cache dirs.
   #
-  # We're pointing all three dirs at the same location, so users will find all
-  # cached data in that single location. We can introduce more env vars and use
-  # them to set the cache dirs separately if needed.
+  # We're pointing all three cache dirs at the same location, so users will find
+  # all cached data in that single location. We can introduce more env vars and
+  # use them to set the cache dirs separately if needed.
   if [[ -n "${ZEBRA_CACHE_DIR}" ]]; then
     mkdir -p "${ZEBRA_CACHE_DIR//\"/}"
     chown -R "${UID}:${GID}" "${ZEBRA_CACHE_DIR//\"/}"
@@ -107,7 +107,7 @@ prepare_conf_file() {
 
 # Runs cargo test with an arbitrary number of arguments.
 #
-# ## Positional Parameters
+# Positional Parameters
 #
 # - '$1' must contain
 #   - either cargo FEATURES as described here:
@@ -121,25 +121,19 @@ run_cargo_test() {
   shift
 
   # Start constructing the command array
-  local cmd_args=(
-    cargo test --locked --release
-    --features "${features}"
-    --package zebrad
-    --test acceptance
-    -- --nocapture --include-ignored
-  )
+  local cmd="cargo test --locked --release --features ${features} --package zebrad --test acceptance -- --nocapture --include-ignored"
 
   # Loop through the remaining arguments
   for arg in "$@"; do
     if [[ -n ${arg} ]]; then
       # If the argument is non-empty, add it to the command
-      cmd_args+=("${arg}")
+      cmd+=("${arg}")
     fi
   done
 
-  echo "Running: ${cmd_args[*]}"
+  echo "Running: ${cmd[*]}"
   # Execute directly to become PID 1
-  exec_as_user "${cmd_args[@]}"
+  exec_as_user "${cmd[@]}"
 }
 
 # Runs tests depending on the env vars.