Compare commits

..

1 Commits

Author SHA1 Message Date
Daniel Bedeleanu
f137ded5aa Build [v1.8.9] (Runtime Permission Healing for Docker Volumes) 2026-04-13 20:32:40 +03:00
6 changed files with 38 additions and 12 deletions

View File

@@ -1,10 +1,11 @@
FROM python:3.12-slim FROM python:3.12-slim
# Install system dependencies required for python-ldap (needed by backend) # Install system dependencies
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
build-essential \ build-essential \
libldap2-dev \ libldap2-dev \
libsasl2-dev \ libsasl2-dev \
gosu \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
WORKDIR /app WORKDIR /app
@@ -26,14 +27,13 @@ COPY scripts ./scripts
ENV DATA_DIR="/app/data" ENV DATA_DIR="/app/data"
ENV LOGS_DIR="/app/logs" ENV LOGS_DIR="/app/logs"
# Ensure the appuser can write to data and logs if we pre-create them, # Pre-create directories and ensure they are writable
# although Docker volumes will handle ownership context.
RUN mkdir -p /app/data /app/logs && chown -R appuser:appuser /app RUN mkdir -p /app/data /app/logs && chown -R appuser:appuser /app
# Make initialization scripts executable # Make initialization scripts executable
RUN chmod +x /app/scripts/init_data.sh /app/backend/entrypoint.sh RUN chmod +x /app/scripts/init_data.sh /app/backend/entrypoint.sh
USER appuser EXPOSE 8000
EXPOSE 8000 EXPOSE 8000

View File

@@ -23,6 +23,10 @@ export LOGS_DIR="${LOGS_DIR:-/app/logs}"
echo "🐳 [Docker] Running data initialization..." echo "🐳 [Docker] Running data initialization..."
bash /app/scripts/init_data.sh bash /app/scripts/init_data.sh
# Hand off to the application server # Fix permissions for mounted volumes (which might be root-owned by the host)
echo "🐳 [Docker] Starting uvicorn..." echo "🐳 [Docker] Fixing volume permissions..."
exec python -m uvicorn backend.main:app --host 0.0.0.0 --port 8000 chown -R appuser:appuser "${DATA_DIR}" "${LOGS_DIR}"
# Hand off to the application server as non-root user
echo "🐳 [Docker] Starting uvicorn as appuser..."
exec gosu appuser python -m uvicorn backend.main:app --host 0.0.0.0 --port 8000

View File

@@ -19,6 +19,7 @@ RUN npm run build
# Step 3: Production image # Step 3: Production image
FROM base AS runner FROM base AS runner
RUN apk add --no-cache su-exec
WORKDIR /app WORKDIR /app
ENV NODE_ENV production ENV NODE_ENV production
@@ -38,11 +39,13 @@ RUN chown nextjs:nodejs .next
COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./ COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
USER nextjs # Copy entrypoint script
COPY entrypoint.sh /app/entrypoint.sh
RUN chmod +x /app/entrypoint.sh
EXPOSE 3000 EXPOSE 3000
ENV PORT 3000 ENV PORT 3000
ENV HOSTNAME "0.0.0.0" ENV HOSTNAME "0.0.0.0"
# Note: The server.js is created by next build from the standalone output ENTRYPOINT ["/app/entrypoint.sh"]
CMD ["node", "server.js"]

View File

@@ -1,5 +1,5 @@
{ {
"version": "1.8.7", "version": "1.8.9",
"last_build": "2026-04-13-1954", "last_build": "2026-04-13-1954",
"codename": "TypeFix" "codename": "TypeFix"
} }

19
frontend/entrypoint.sh Normal file
View File

@@ -0,0 +1,19 @@
#!/bin/sh
# =============================================================================
# frontend/entrypoint.sh
# =============================================================================
# Docker container entrypoint for TFM aInventory frontend.
# Fixes permissions for the logs volume and starts the Node.js server.
# =============================================================================
set -e
# Fix permissions for the logs directory (useful if mounted as a volume)
if [ -d "/app/logs" ]; then
echo "🐳 [Docker] Fixing /app/logs permissions..."
chown -R nextjs:nodejs /app/logs
fi
# Hand off to the application server as the nextjs user
echo "🐳 [Docker] Starting Next.js standalone server as nextjs user..."
exec su-exec nextjs node server.js

File diff suppressed because one or more lines are too long