From 4f138c7055fa9dc49da28cc144e70e8258534e2c Mon Sep 17 00:00:00 2001 From: Sampo Tawast Date: Tue, 20 Aug 2024 10:55:11 +0300 Subject: [PATCH] chore: resolve broken gcc deps --- backend/docker/benefit-ubi-arm.Dockerfile | 6 +++--- backend/docker/benefit.Dockerfile | 6 +++--- backend/docker/kesaseteli.Dockerfile | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/docker/benefit-ubi-arm.Dockerfile b/backend/docker/benefit-ubi-arm.Dockerfile index 55dac496b8..e6a26a7c62 100644 --- a/backend/docker/benefit-ubi-arm.Dockerfile +++ b/backend/docker/benefit-ubi-arm.Dockerfile @@ -23,8 +23,8 @@ RUN dnf update -y \ xmlsec1 \ xmlsec1-openssl \ cyrus-sasl-devel \ - openssl-devel \ - && pip install -U pip \ + openssl-devel +RUN pip install -U pip \ && pip install --no-cache-dir -r /app/requirements.txt \ && pip install --no-cache-dir -r /app/requirements-prod.txt \ && uwsgi --build-plugin /app/.prod/escape_json.c \ @@ -54,7 +54,7 @@ FROM appbase AS development # ============================== COPY --chown=default:root benefit/requirements-dev.txt /app/requirements-dev.txt -RUN dnf install -y gcc \ +RUN dnf install -y gcc --allowerasing \ && pip install --no-cache-dir -r /app/requirements-dev.txt \ && dnf remove -y gcc \ && dnf clean all diff --git a/backend/docker/benefit.Dockerfile b/backend/docker/benefit.Dockerfile index 7f737fd451..d87762e266 100644 --- a/backend/docker/benefit.Dockerfile +++ b/backend/docker/benefit.Dockerfile @@ -23,8 +23,8 @@ RUN dnf update -y \ xmlsec1 \ xmlsec1-openssl \ cyrus-sasl-devel \ - openssl-devel \ - && pip install -U pip \ + openssl-devel +RUN pip install -U pip \ && pip install --no-cache-dir -r /app/requirements.txt \ && pip install --no-cache-dir -r /app/requirements-prod.txt \ && uwsgi --build-plugin /app/.prod/escape_json.c \ @@ -54,7 +54,7 @@ FROM appbase AS development # ============================== COPY --chown=default:root benefit/requirements-dev.txt /app/requirements-dev.txt -RUN dnf install -y gcc \ +RUN dnf install -y gcc --allowerasing \ && pip install --no-cache-dir -r /app/requirements-dev.txt \ && dnf remove -y gcc \ && dnf clean all diff --git a/backend/docker/kesaseteli.Dockerfile b/backend/docker/kesaseteli.Dockerfile index d571f0ce20..3b02746818 100644 --- a/backend/docker/kesaseteli.Dockerfile +++ b/backend/docker/kesaseteli.Dockerfile @@ -41,7 +41,7 @@ FROM appbase AS development # ============================== COPY --chown=default:root kesaseteli/requirements-dev.txt /app/requirements-dev.txt -RUN dnf install -y gcc \ +RUN dnf install -y gcc --allowerasing \ && pip install --no-cache-dir -r /app/requirements-dev.txt \ && dnf remove -y gcc \ && dnf clean all