Merge branch 'dev-7' into dev-8
This commit is contained in:
@@ -28,6 +28,7 @@ ENV PYTHONDONTWRITEBYTECODE=1 \
|
||||
# Install runtime dependencies only
|
||||
RUN apt-get update && apt-get upgrade -y && apt-get install -y \
|
||||
curl \
|
||||
sqlite3 \
|
||||
&& rm -rf /var/lib/apt/lists/* \
|
||||
&& apt-get clean
|
||||
|
||||
@@ -37,15 +38,20 @@ RUN groupadd -g 1001 deploy && useradd -u 1001 -g deploy deploy
|
||||
# Copy virtual environment from builder
|
||||
COPY --from=builder /opt/venv /opt/venv
|
||||
ENV PATH="/opt/venv/bin:$PATH"
|
||||
RUN chown -R deploy:deploy /opt/venv
|
||||
RUN chown -R 1001:1001 /opt/venv
|
||||
|
||||
# Create app directory and set permissions
|
||||
WORKDIR /app
|
||||
RUN mkdir -p /app/database /app/logs && \
|
||||
chown -R deploy:deploy /app
|
||||
chown -R 1001:1001 /app
|
||||
|
||||
# Copy application code
|
||||
COPY --chown=deploy:deploy . .
|
||||
COPY --chown=1001:1001 . .
|
||||
|
||||
# Initialize SQLite database with schema
|
||||
RUN sqlite3 /app/database/tg-bot-database.db < /app/database/schema.sql && \
|
||||
chown 1001:1001 /app/database/tg-bot-database.db && \
|
||||
chmod 644 /app/database/tg-bot-database.db
|
||||
|
||||
# Switch to non-root user
|
||||
USER deploy
|
||||
|
||||
Reference in New Issue
Block a user