mirror of
https://github.com/DRYTRIX/TimeTracker.git
synced 2026-01-19 19:09:56 -06:00
b880191c16
Timer/Editing - Add/edit time-entry UI and flows in templates (`templates/timer/*`) - Extend timer and API routes (`app/routes/timer.py`, `app/routes/api.py`) - Update mobile interactions (`app/static/mobile.js`) Invoices/PDF - Improve invoice model and route handling (`app/models/invoice.py`, `app/routes/invoices.py`) - Enhance PDF generation and fallback logic (`app/utils/pdf_generator*.py`) - Adjust invoice view layout (`templates/invoices/view.html`) Docker/Startup - Refine Docker build and startup paths (`Dockerfile`) - Improve init/entrypoint scripts (`docker/init-database-*.py`, new `docker/entrypoint*.sh`, `docker/entrypoint.py`) - General startup robustness and permissions fixes Docs/UI - Refresh README and Docker docs (setup, troubleshooting, structure) - Minor UI/help updates (`templates/main/help.html`, `templates/projects/create.html`) - Remove obsolete asset (`assets/screenshots/Task_Management.png`) - Add repo hygiene updates (e.g., `.gitattributes`)
90 lines
2.9 KiB
Docker
90 lines
2.9 KiB
Docker
FROM python:3.11-slim-bullseye
|
|
|
|
# Set environment variables
|
|
ENV PYTHONDONTWRITEBYTECODE=1
|
|
ENV PYTHONUNBUFFERED=1
|
|
ENV FLASK_APP=app
|
|
ENV FLASK_ENV=production
|
|
|
|
# Install system dependencies
|
|
RUN apt-get update && apt-get install -y \
|
|
curl \
|
|
tzdata \
|
|
bash \
|
|
dos2unix \
|
|
# Network tools for debugging
|
|
iproute2 \
|
|
net-tools \
|
|
iputils-ping \
|
|
dnsutils \
|
|
# WeasyPrint dependencies (Debian Bullseye package names)
|
|
libgdk-pixbuf2.0-0 \
|
|
libpango-1.0-0 \
|
|
libcairo2 \
|
|
libpangocairo-1.0-0 \
|
|
libffi-dev \
|
|
shared-mime-info \
|
|
# Additional fonts and rendering support
|
|
fonts-liberation \
|
|
fonts-dejavu-core \
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
# Set work directory
|
|
WORKDIR /app
|
|
|
|
# Set default timezone
|
|
ENV TZ=Europe/Rome
|
|
|
|
# Install Python dependencies
|
|
COPY requirements.txt .
|
|
RUN pip install --no-cache-dir -r requirements.txt
|
|
|
|
# Copy project
|
|
COPY . .
|
|
|
|
# Create data and logs directories with proper permissions
|
|
RUN mkdir -p /data /app/logs && chmod 755 /data && chmod 755 /app/logs
|
|
|
|
# Create upload directories with proper permissions
|
|
RUN mkdir -p /app/app/static/uploads/logos /app/static/uploads/logos && \
|
|
chmod -R 755 /app/app/static/uploads && \
|
|
chmod -R 755 /app/static/uploads
|
|
|
|
# Copy the startup script and ensure it's executable
|
|
COPY docker/start-fixed.py /app/start.py
|
|
|
|
# Fix line endings for the startup and entrypoint scripts
|
|
RUN dos2unix /app/start.py /app/docker/entrypoint_fixed.sh /app/docker/entrypoint.sh /app/docker/entrypoint_simple.sh 2>/dev/null || true
|
|
|
|
# Make startup scripts executable and ensure proper line endings
|
|
RUN chmod +x /app/start.py /app/docker/init-database.py /app/docker/init-database-sql.py /app/docker/init-database-enhanced.py /app/docker/verify-database.py /app/docker/test-db.py /app/docker/test-routing.py /app/docker/entrypoint.sh /app/docker/entrypoint_fixed.sh /app/docker/entrypoint_simple.sh /app/docker/entrypoint.py /app/docker/startup_with_migration.py /app/docker/test_db_connection.py /app/docker/debug_startup.sh /app/docker/simple_test.sh && \
|
|
ls -la /app/docker/entrypoint.py && \
|
|
head -5 /app/docker/entrypoint.py
|
|
|
|
# Create non-root user
|
|
RUN useradd -m -u 1000 timetracker && \
|
|
chown -R timetracker:timetracker /app /data /app/logs /app/app/static/uploads /app/static/uploads
|
|
|
|
# Verify startup script exists and is accessible
|
|
RUN ls -la /app/start.py && \
|
|
head -1 /app/start.py
|
|
|
|
# Verify entrypoint script exists and is accessible
|
|
RUN ls -la /app/docker/entrypoint.py && \
|
|
head -1 /app/docker/entrypoint.py
|
|
|
|
USER timetracker
|
|
|
|
# Expose port
|
|
EXPOSE 8080
|
|
|
|
# Health check
|
|
HEALTHCHECK --interval=30s --timeout=10s --start-period=40s --retries=3 \
|
|
CMD curl -f http://localhost:8080/_health || exit 1
|
|
|
|
# Set the entrypoint back to the fixed shell script
|
|
ENTRYPOINT ["/app/docker/entrypoint_fixed.sh"]
|
|
|
|
# Run the application via python to avoid shebang/CRLF issues
|
|
CMD ["python", "/app/start.py"]
|