Correct log implementations

This commit is contained in:
Christbru 2025-10-18 21:31:49 -05:00
commit 88f79356f2
2 changed files with 16 additions and 12 deletions

View file

@ -20,7 +20,7 @@ services:
depends_on: depends_on:
- mysql - mysql
volumes: volumes:
- ~/astra-errors.log:/var/log/astra-errors.log - ~/astra-logs:/var/log
mysql: mysql:
image: mysql:8.0 image: mysql:8.0

View file

@ -25,16 +25,20 @@ ENV PATH="/usr/local/cargo/bin:${PATH}"
# Copy manifest files first to leverage Docker layer caching for dependencies # Copy manifest files first to leverage Docker layer caching for dependencies
COPY Cargo.toml Cargo.lock rust-toolchain.toml ./ COPY Cargo.toml Cargo.lock rust-toolchain.toml ./
# Ensure the pinned toolchain from rust-toolchain.toml (or provided ARG) is installed in a cacheable layer # Ensure the pinned toolchain from rust-toolchain.toml (or provided ARG) is installed only if missing
RUN set -eux; \ RUN set -eux; \
if [ -n "${RUSTUP_TOOLCHAIN}" ]; then \ if [ -n "${RUSTUP_TOOLCHAIN}" ]; then \
rustup toolchain install "${RUSTUP_TOOLCHAIN}" && \ if ! rustup toolchain list | grep -q "^${RUSTUP_TOOLCHAIN}"; then \
rustup toolchain install "${RUSTUP_TOOLCHAIN}"; \
fi; \
rustup default "${RUSTUP_TOOLCHAIN}"; \ rustup default "${RUSTUP_TOOLCHAIN}"; \
else \ else \
if [ -f rust-toolchain.toml ]; then \ if [ -f rust-toolchain.toml ]; then \
TOOLCHAIN=$(sed -n 's/^channel *= *"\(.*\)"/\1/p' rust-toolchain.toml | head -n1); \ TOOLCHAIN=$(sed -n 's/^channel *= *"\(.*\)"/\1/p' rust-toolchain.toml | head -n1); \
if [ -n "$TOOLCHAIN" ]; then \ if [ -n "$TOOLCHAIN" ]; then \
rustup toolchain install "$TOOLCHAIN" && \ if ! rustup toolchain list | grep -q "^$TOOLCHAIN"; then \
rustup toolchain install "$TOOLCHAIN"; \
fi; \
rustup default "$TOOLCHAIN"; \ rustup default "$TOOLCHAIN"; \
fi; \ fi; \
fi; \ fi; \