From 41816b08e754950dc46fb6fe7d04af82f29de6b8 Mon Sep 17 00:00:00 2001 From: Zack Ganger Date: Tue, 30 Apr 2024 19:44:46 -0400 Subject: [PATCH 1/2] patching images, python, and postgres versions --- backend/Dockerfile | 2 +- docker-compose.yml | 2 +- requirements/Dockerfile | 4 ++-- runtime.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index c75499f56..63aceab68 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3-slim-buster AS base +FROM python:3-slim-bullseye AS base RUN apt-get update && apt-get install curl -y && apt-get install g++ libpq-dev gcc -y diff --git a/docker-compose.yml b/docker-compose.yml index 67fc425f3..164e850a9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: db: - image: postgres:16.1 #AWS RDS latest version + image: postgres:16.2 #AWS RDS latest version env_file: - ".env" volumes: diff --git a/requirements/Dockerfile b/requirements/Dockerfile index a400715fd..0c2d03836 100644 --- a/requirements/Dockerfile +++ b/requirements/Dockerfile @@ -2,7 +2,7 @@ # requirements, so this image starts with the same image as the database # containers and installs the same version of python as the api containers -FROM postgres:16.1 as base +FROM postgres:16.2 as base RUN apt-get update && apt-get install -y \ make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev \ @@ -15,7 +15,7 @@ SHELL ["bash", "-lc"] RUN curl https://pyenv.run | bash && \ echo 'export PATH="$HOME/.pyenv/shims:$HOME/.pyenv/bin:$PATH"' >> ~/.bashrc -ENV PYTHON_VERSION=3.12.2 +ENV PYTHON_VERSION=3.12.3 RUN pyenv install ${PYTHON_VERSION} && pyenv global ${PYTHON_VERSION} RUN pip install pip-tools diff --git a/runtime.txt b/runtime.txt index 6e797d468..4ddc7cd66 100644 --- a/runtime.txt +++ b/runtime.txt @@ -1 +1 @@ -python-3.12.2 +python-3.12.3 From c4218e5a93e07045de9f4d945251ed6e0df984fe Mon Sep 17 00:00:00 2001 From: Zack Ganger Date: Tue, 30 Apr 2024 20:44:13 -0400 Subject: [PATCH 2/2] match to local image --- backend/Dockerfile.cloud | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/Dockerfile.cloud b/backend/Dockerfile.cloud index 19a1b763a..3703a9437 100644 --- a/backend/Dockerfile.cloud +++ b/backend/Dockerfile.cloud @@ -1,6 +1,6 @@ # docker build command: # docker build -t police-data-trust-backend-dev -f backend/Dockerfile.cloud . -FROM python:3-slim-buster +FROM python:3-slim-bullseye WORKDIR /app/