From eb8088164bf8e799cd95df2f053bdaef24fa97e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Diot?= Date: Tue, 3 Oct 2023 13:55:29 +0200 Subject: [PATCH] Tweak Dockerfiles to make the build nicer --- src/scheduler/Dockerfile | 6 +++--- src/ui/Dockerfile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/scheduler/Dockerfile b/src/scheduler/Dockerfile index 27704af3b..277ceaf02 100644 --- a/src/scheduler/Dockerfile +++ b/src/scheduler/Dockerfile @@ -1,5 +1,8 @@ FROM python:3.11.5-alpine@sha256:cd311c6a0164f34a7edbf364e05258b07d66d3f7bc155139dcb9bef88a186ded AS builder +# Install python dependencies +RUN apk add --no-cache --virtual .build-deps g++ gcc musl-dev jpeg-dev zlib-dev libffi-dev cairo-dev pango-dev gdk-pixbuf-dev openssl-dev cargo postgresql-dev + # Copy python requirements COPY src/deps/requirements.txt /tmp/requirements-deps.txt COPY src/scheduler/requirements.txt /tmp/req/requirements.txt @@ -12,9 +15,6 @@ RUN mkdir -p deps/python && \ cat /tmp/req/requirements.txt* > deps/requirements.txt && \ rm -rf /tmp/req -# Install python dependencies -RUN apk add --no-cache --virtual .build-deps g++ gcc musl-dev jpeg-dev zlib-dev libffi-dev cairo-dev pango-dev gdk-pixbuf-dev openssl-dev cargo postgresql-dev - # Install python requirements RUN export MAKEFLAGS="-j$(nproc)" && \ pip install --no-cache-dir --ignore-installed --require-hashes -r /tmp/requirements-deps.txt && \ diff --git a/src/ui/Dockerfile b/src/ui/Dockerfile index 78660427f..968597092 100755 --- a/src/ui/Dockerfile +++ b/src/ui/Dockerfile @@ -1,5 +1,8 @@ FROM python:3.11.5-alpine@sha256:cd311c6a0164f34a7edbf364e05258b07d66d3f7bc155139dcb9bef88a186ded AS builder +# Install python dependencies +RUN apk add --no-cache --virtual .build-deps g++ gcc musl-dev jpeg-dev zlib-dev libffi-dev cairo-dev pango-dev gdk-pixbuf-dev openssl-dev cargo postgresql-dev file make + # Copy python requirements COPY src/deps/requirements.txt /tmp/requirements-deps.txt COPY src/ui/requirements.txt /tmp/req/requirements.txt @@ -12,9 +15,6 @@ RUN mkdir -p deps/python && \ cat /tmp/req/requirements.txt* > deps/requirements.txt && \ rm -rf /tmp/req -# Install python dependencies -RUN apk add --no-cache --virtual .build-deps g++ gcc musl-dev jpeg-dev zlib-dev libffi-dev cairo-dev pango-dev gdk-pixbuf-dev openssl-dev cargo postgresql-dev file make - # Install python requirements RUN export MAKEFLAGS="-j$(nproc)" && \ pip install --no-cache-dir --ignore-installed --require-hashes -r /tmp/requirements-deps.txt && \