From 49396e06784ac54b3602790b8386a42b475d3142 Mon Sep 17 00:00:00 2001 From: IRBorisov <8611739+IRBorisov@users.noreply.github.com> Date: Sat, 20 Apr 2024 17:56:03 +0300 Subject: [PATCH] Simplify backend build. Rely on wheels from packages --- rsconcept/backend/Dockerfile | 20 -------------------- rsconcept/backend/requirements.txt | 2 +- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/rsconcept/backend/Dockerfile b/rsconcept/backend/Dockerfile index c16149e3..bb2db3f4 100644 --- a/rsconcept/backend/Dockerfile +++ b/rsconcept/backend/Dockerfile @@ -15,7 +15,6 @@ RUN apt-get update -qq && \ add-apt-repository -y ppa:ubuntu-toolchain-r/test && \ apt-get install -y --no-install-recommends \ python3.12 \ - python3.12-dev \ libstdc++6 && \ curl -sS https://bootstrap.pypa.io/get-pip.py | python3.12 && \ python3.12 -m pip install --upgrade pip && \ @@ -32,25 +31,6 @@ FROM python-base as builder ENV PYTHONDONTWRITEBYTECODE 1 ENV PYTHONUNBUFFERED 1 -# Setup additional dev tools -RUN apt-get update -qq && \ - apt-get full-upgrade -y && \ - apt-get install -y --no-install-recommends \ - software-properties-common \ - build-essential && \ - rm -rf /var/lib/apt/lists/* - -# Add GCC compiler -ARG GCC_VER="13" -RUN add-apt-repository -y ppa:ubuntu-toolchain-r/test && \ - apt-get update -qq && \ - apt-get install -y --no-install-recommends \ - gcc-${GCC_VER} \ - g++-${GCC_VER} && \ - update-alternatives --install /usr/bin/gcc gcc $(which gcc-${GCC_VER}) 100 && \ - update-alternatives --install /usr/bin/g++ g++ $(which g++-${GCC_VER}) 100 && \ - rm -rf /var/lib/apt/lists/* - COPY ./requirements.txt ./ RUN python3.12 -m pip wheel \ --no-cache-dir --no-deps \ diff --git a/rsconcept/backend/requirements.txt b/rsconcept/backend/requirements.txt index 1e8ae911..ab99076f 100644 --- a/rsconcept/backend/requirements.txt +++ b/rsconcept/backend/requirements.txt @@ -7,7 +7,7 @@ drf-spectacular==0.27.2 coreapi==2.3.3 django-rest-passwordreset==1.4.0 cctext==0.1.3 -pyconcept==0.1.1 +pyconcept==0.1.2 psycopg2-binary==2.9.9 gunicorn==22.0.0 \ No newline at end of file