From 15cc22414b2844bf5077137a6147e1aca8b3b892 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Thu, 30 Jan 2025 17:43:15 +0100 Subject: [PATCH] and again and agin again --- Dockerfile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index d037d63..107d659 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,21 +7,21 @@ ENV PATH="/app/.venv/bin:$PATH" ENV STATIC_ROOT=/app/staticfiles ENV MEDIA_ROOT=/app/mediafiles -# Install uv -COPY --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/uv +# Install binaries with correct permissions +COPY --from=ghcr.io/astral-sh/uv:latest --chown=root:root --chmod=755 /uv /usr/local/bin/uv +COPY --from=caddy:latest --chown=root:root --chmod=755 /usr/bin/caddy /usr/local/bin/caddy +COPY --chmod=755 docker/run.sh /usr/local/bin/runhub.sh -# Install Caddy -COPY --from=docker.io/caddy:latest /usr/bin/caddy /usr/local/bin/caddy -COPY docker/run.sh /usr/local/bin/runhub.sh COPY docker/Caddyfile /app/config/caddy/Caddyfile - ADD . /app RUN uv sync --frozen \ && uv pip install gunicorn --no-cache-dir \ - && chmod a+x /usr/local/bin/runhub.sh && chmod 777 /usr/local/bin/caddy \ - && mkdir -p /app/config/caddy /app/run/caddy /app/run/gunicorn && chgrp -R 0 /app && chmod -R g=u /app && chmod g+w /app/config/caddy/Caddyfile \ + && mkdir -p /app/config/caddy /app/run/caddy /app/run/gunicorn \ + && chgrp -R 0 /app \ + && chmod -R g=u /app \ + && chmod g+w /app/config/caddy/Caddyfile \ && SECRET_KEY= python -m hub collectstatic --noinput -CMD ["/usr/local/bin/runhub.sh"] +CMD ["/usr/local/bin/runhub.sh"] \ No newline at end of file