diff --git a/tdrs-backend/Dockerfile b/tdrs-backend/Dockerfile index a2616768a..606b86b79 100644 --- a/tdrs-backend/Dockerfile +++ b/tdrs-backend/Dockerfile @@ -1,5 +1,4 @@ -FROM python:3.10.8-buster - #slim-bullseye +FROM python:3.10.8-slim-bullseye ENV PYTHONUNBUFFERED 1 ARG user=tdpuser @@ -11,7 +10,6 @@ ENV DJANGO_CONFIGURATION=Local # Allows docker to cache installed dependencies between builds COPY Pipfile Pipfile.lock /tdpapp/ COPY sources.list /etc/apt/sources.list -#RUN bash -c 'echo "deb https://tdp-nexus.dev.raftlabs.tech/repository/apt-proxy/ buster main"' >> /etc/apt/sources.list WORKDIR /tdpapp/ # Download latest listing of available packages: RUN apt-get -y update @@ -21,10 +19,10 @@ RUN apt-get -y upgrade RUN apt-get install -y gcc graphviz graphviz-dev libpq-dev python3-dev vim curl ca-certificates # Postgres client setup -RUN bash -c 'echo "deb [trusted=yes] https://tdp-nexus.dev.raftlabs.tech/repository/apt-proxy-postgres/ buster-pdpg main" >> /etc/apt/sources.list' +#RUN bash -c 'echo "deb [trusted=yes] https://tdp-nexus.dev.raftlabs.tech/repository/apt-proxy-postgres/ bullseye-pdpg main" >> /etc/apt/sources.list' RUN apt-get update -y && apt-get upgrade -y RUN apt install -y postgresql-common && install -d /usr/share/postgresql-common/pgdg && \ -sh -c 'echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc trusted=yes] https://tdp-nexus.dev.raftlabs.tech/repository/apt-proxy-postgres/ buster-pgdg main" >> /etc/apt/sources.list' && \ +sh -c 'echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc trusted=yes] https://tdp-nexus.dev.raftlabs.tech/repository/apt-proxy-postgres/ bullseye-pgdg main" >> /etc/apt/sources.list' && \ curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc && \ apt -y update && apt -y upgrade && apt install postgresql-client-15 -y diff --git a/tdrs-backend/sources.list b/tdrs-backend/sources.list index 8b8a74298..10c49c2f8 100644 --- a/tdrs-backend/sources.list +++ b/tdrs-backend/sources.list @@ -1,3 +1,3 @@ -deb https://tdp-nexus.dev.raftlabs.tech/repository/apt-proxy/ buster main -deb https://tdp-nexus.dev.raftlabs.tech/repository/apt-proxy/ buster-updates main -deb https://tdp-nexus.dev.raftlabs.tech/repository/apt-proxy-security/ buster/updates main +deb https://tdp-nexus.dev.raftlabs.tech/repository/apt-proxy/ bullseye main +deb https://tdp-nexus.dev.raftlabs.tech/repository/apt-proxy/ bullseye-updates main +deb https://tdp-nexus.dev.raftlabs.tech/repository/apt-proxy-security/ bullseye-security main