From 9ef4ef47f4478aa00d09633041b1ca0763b06239 Mon Sep 17 00:00:00 2001 From: Markos Gogoulos Date: Sat, 15 Nov 2025 18:15:20 +0200 Subject: [PATCH] wtv --- .dockerignore | 37 ++++++++++++++++++++++++++++++++++++- Dockerfile | 7 +++---- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/.dockerignore b/.dockerignore index 5171c540..4d3a0e5a 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1,37 @@ +# Dependencies node_modules -npm-debug.log \ No newline at end of file +npm-debug.log + +# Local development files - exclude uploaded content but keep placeholder images +media_files/* +!media_files/userlogos/ +media_files/userlogos/* +!media_files/userlogos/*.jpg +logs +static_collected + +# Version control +.git +.github +.gitignore + +# Development/testing +.pytest_cache +.qodo +.claude + +# Docker +.dockerignore +Dockerfile +docker-compose*.yml +.docker-backup + +# Documentation (if you don't need it in the image) +docs + +# Other +*.pyc +__pycache__ +.env +.vscode +.idea \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 497c2731..aeee5654 100644 --- a/Dockerfile +++ b/Dockerfile @@ -84,8 +84,8 @@ COPY --from=build-image /usr/local/bin/ffprobe /usr/local/bin/ffprobe COPY --from=build-image /usr/local/bin/qt-faststart /usr/local/bin/qt-faststart COPY --from=build-image /home/mediacms.io/bento4 /home/mediacms.io/bento4 -# Copy application files -COPY . /home/mediacms.io/mediacms +# Copy application files with correct ownership +COPY --chown=www-data:www-data . /home/mediacms.io/mediacms WORKDIR /home/mediacms.io/mediacms # Copy imagemagick policy for sprite thumbnail generation @@ -96,8 +96,7 @@ RUN cp config/local_settings.py cms/local_settings.py 2>/dev/null || true # Create www-data user directories and set permissions RUN mkdir -p /var/run/mediacms && \ - chown -R www-data:www-data /home/mediacms.io/mediacms && \ - chown -R www-data:www-data /var/run/mediacms + chown www-data:www-data /var/run/mediacms ############ WEB IMAGE (Django/uWSGI) ############ FROM base AS web