docker python fix
This commit is contained in:
42
Dockerfile
42
Dockerfile
@@ -1,8 +1,12 @@
|
|||||||
# Use Python 3.12 slim image for smaller size
|
# Use Python 3.11 slim image (revert from 3.12)
|
||||||
FROM python:3.12-slim
|
FROM python:3.11-slim
|
||||||
|
|
||||||
# Install cron
|
# Install cron and other dependencies
|
||||||
RUN apt-get update && apt-get install -y cron && rm -rf /var/lib/apt/lists/*
|
RUN apt-get update && apt-get install -y \
|
||||||
|
cron \
|
||||||
|
gcc \
|
||||||
|
curl \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# Set working directory
|
# Set working directory
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
@@ -14,19 +18,12 @@ ENV PYTHONDONTWRITEBYTECODE=1 \
|
|||||||
FLASK_ENV=production
|
FLASK_ENV=production
|
||||||
|
|
||||||
# Optional: Set default configuration via environment variables
|
# Optional: Set default configuration via environment variables
|
||||||
# These can be overridden when running the container
|
|
||||||
ENV DATABASE_PATH=/app/data/price_tracker.db \
|
ENV DATABASE_PATH=/app/data/price_tracker.db \
|
||||||
DELAY_BETWEEN_REQUESTS=2 \
|
DELAY_BETWEEN_REQUESTS=2 \
|
||||||
MAX_CONCURRENT_REQUESTS=1 \
|
MAX_CONCURRENT_REQUESTS=1 \
|
||||||
REQUEST_TIMEOUT=30 \
|
REQUEST_TIMEOUT=30 \
|
||||||
RETRY_ATTEMPTS=3
|
RETRY_ATTEMPTS=3
|
||||||
|
|
||||||
# Install system dependencies
|
|
||||||
RUN apt-get update && apt-get install -y \
|
|
||||||
gcc \
|
|
||||||
curl \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
# Copy requirements first for better caching
|
# Copy requirements first for better caching
|
||||||
COPY requirements.txt .
|
COPY requirements.txt .
|
||||||
|
|
||||||
@@ -34,8 +31,12 @@ COPY requirements.txt .
|
|||||||
RUN pip install --no-cache-dir -r requirements.txt
|
RUN pip install --no-cache-dir -r requirements.txt
|
||||||
|
|
||||||
# Create non-root user for security
|
# Create non-root user for security
|
||||||
RUN useradd --create-home --shell /bin/bash tracker && \
|
RUN useradd --create-home --shell /bin/bash tracker
|
||||||
chown -R tracker:tracker /app
|
|
||||||
|
# Create necessary directories with proper permissions
|
||||||
|
RUN mkdir -p /app/data /var/log && \
|
||||||
|
chmod 755 /app/data /var/log && \
|
||||||
|
chown -R tracker:tracker /app/data /var/log
|
||||||
|
|
||||||
# Copy application code
|
# Copy application code
|
||||||
COPY . .
|
COPY . .
|
||||||
@@ -113,14 +114,23 @@ RUN echo "0 8 * * * cd /app && python daily_scraper.py >> /var/log/cron.log 2>&1
|
|||||||
RUN chmod 0644 /etc/cron.d/price-tracker
|
RUN chmod 0644 /etc/cron.d/price-tracker
|
||||||
RUN crontab /etc/cron.d/price-tracker
|
RUN crontab /etc/cron.d/price-tracker
|
||||||
|
|
||||||
# Create startup script
|
# Create startup script that ensures directories exist and have correct permissions
|
||||||
RUN echo '#!/bin/bash\n\
|
RUN echo '#!/bin/bash\n\
|
||||||
|
# Ensure data directory exists and has correct permissions\n\
|
||||||
|
mkdir -p /app/data /var/log\n\
|
||||||
|
chown -R tracker:tracker /app/data /var/log\n\
|
||||||
|
chmod 755 /app/data /var/log\n\
|
||||||
|
\n\
|
||||||
# Start cron in background\n\
|
# Start cron in background\n\
|
||||||
cron\n\
|
cron\n\
|
||||||
# Start web server in foreground\n\
|
\n\
|
||||||
exec python main.py --mode web\n\
|
# Switch to non-root user and start web server\n\
|
||||||
|
exec su tracker -c "python main.py --mode web"\n\
|
||||||
' > /app/start.sh && chmod +x /app/start.sh
|
' > /app/start.sh && chmod +x /app/start.sh
|
||||||
|
|
||||||
|
# Set ownership for application files
|
||||||
|
RUN chown -R tracker:tracker /app
|
||||||
|
|
||||||
# Expose port
|
# Expose port
|
||||||
EXPOSE 5000
|
EXPOSE 5000
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user