chore: resolve broken gcc deps

City-of-Helsinki · Aug 20, 2024 · 4f138c7 · 4f138c7
1 parent 6315278
commit 4f138c7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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