From 1afc3f86b19ba9d59d4799fd879f4c0064f29568 Mon Sep 17 00:00:00 2001 From: Franz Forstmayr Date: Wed, 29 Jan 2025 15:09:06 +0100 Subject: [PATCH 1/2] fix: Use requirements for docker prod build --- deploy/docker/run/Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/deploy/docker/run/Dockerfile b/deploy/docker/run/Dockerfile index 0c95f9df..7e3c87c9 100644 --- a/deploy/docker/run/Dockerfile +++ b/deploy/docker/run/Dockerfile @@ -62,7 +62,8 @@ COPY public ./public/ COPY resources ./resources/ RUN uv run pip install --quiet cython \ && uv sync ${UV_INSTALL_ARGS} --frozen --no-install-project --no-editable \ - && uv export ${UV_INSTALL_ARGS} --frozen --no-hashes --output-file=requirements.txt + && uv export ${UV_INSTALL_ARGS} --frozen --no-hashes --output-file=requirements.txt \ + --no-emit-workspace --no-group dev --no-group test --no-group linting --no-group docs COPY src ./src/ # build the frontend and sync the project @@ -103,8 +104,10 @@ RUN addgroup --system --gid 65532 nonroot \ && chown -R nonroot:nonroot /workspace COPY --from=builder --chown=65532:65532 /cloudsql /cloudsql COPY --from=builder --chown=65532:65532 /workspace/app/dist /tmp/ +COPY --from=builder --chown=65532:65532 /workspace/app/requirements.txt /tmp/ WORKDIR /workspace/app -RUN uv pip ${UV_INSTALL_ARGS} install --quiet --disable-pip-version-check /tmp/*.whl \ +RUN uv pip ${UV_INSTALL_ARGS} install --quiet --disable-pip-version-check /tmp/*.whl --no-deps \ + && uv pip ${UV_INSTALL_ARGS} install -r /tmp/requirements.txt \ && rm -Rf /tmp/* \ && chown -R nonroot:nonroot /workspace/app USER nonroot From 4a4d8a9c3254a9fcc5fbff9e07ef819f95dff8ee Mon Sep 17 00:00:00 2001 From: Franz Forstmayr Date: Wed, 29 Jan 2025 15:14:00 +0100 Subject: [PATCH 2/2] fix: warnings from ci --- deploy/docker/run/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/docker/run/Dockerfile b/deploy/docker/run/Dockerfile index 7e3c87c9..adf74487 100644 --- a/deploy/docker/run/Dockerfile +++ b/deploy/docker/run/Dockerfile @@ -104,7 +104,7 @@ RUN addgroup --system --gid 65532 nonroot \ && chown -R nonroot:nonroot /workspace COPY --from=builder --chown=65532:65532 /cloudsql /cloudsql COPY --from=builder --chown=65532:65532 /workspace/app/dist /tmp/ -COPY --from=builder --chown=65532:65532 /workspace/app/requirements.txt /tmp/ +COPY --from=builder --chown=65532:65532 --chmod=755 /workspace/app/requirements.txt /tmp/ WORKDIR /workspace/app RUN uv pip ${UV_INSTALL_ARGS} install --quiet --disable-pip-version-check /tmp/*.whl --no-deps \ && uv pip ${UV_INSTALL_ARGS} install -r /tmp/requirements.txt \