From a107a09b57092f447649b8c8b01d8d1f09249b44 Mon Sep 17 00:00:00 2001 From: Lander Noterman Date: Fri, 14 Feb 2025 08:50:08 +0100 Subject: [PATCH] fix pip stuff --- docker/main/Dockerfile | 7 +++++-- docker/main/install_deps.sh | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docker/main/Dockerfile b/docker/main/Dockerfile index 097f75938..7907b3cec 100644 --- a/docker/main/Dockerfile +++ b/docker/main/Dockerfile @@ -2,14 +2,16 @@ # https://askubuntu.com/questions/972516/debian-frontend-environment-variable ARG DEBIAN_FRONTEND=noninteractive +ARG PIP_BREAK_SYSTEM_PACKAGES=1 ARG BASE_IMAGE=debian:12 ARG SLIM_BASE=debian:12-slim FROM ${BASE_IMAGE} AS base +ARG PIP_BREAK_SYSTEM_PACKAGES # Ensure python 3.11 is available in ubuntu-based image -RUN if [ -e /etc/lsb-release ]; then \ +RUN if grep -iq "ubuntu" /etc/os-release; then \ apt-get update && \ apt-get install -y software-properties-common && \ add-apt-repository ppa:deadsnakes/ppa; \ @@ -18,9 +20,10 @@ RUN if [ -e /etc/lsb-release ]; then \ FROM --platform=${BUILDPLATFORM} debian:12 AS base_host FROM ${SLIM_BASE} AS slim-base +ARG PIP_BREAK_SYSTEM_PACKAGES # Ensure python 3.11 is available in ubuntu-based image -RUN if [ -e /etc/lsb-release ]; then \ +RUN if grep -iq "ubuntu" /etc/os-release; then \ apt-get update && \ apt-get install -y software-properties-common && \ add-apt-repository ppa:deadsnakes/ppa; \ diff --git a/docker/main/install_deps.sh b/docker/main/install_deps.sh index 4a695f04a..92a203ba1 100755 --- a/docker/main/install_deps.sh +++ b/docker/main/install_deps.sh @@ -6,6 +6,7 @@ apt-get -qq update apt-get -qq install --no-install-recommends -y \ apt-transport-https \ + ca-certificates \ gnupg \ wget \ lbzip2 \