From ceba30f2280adc754250ee1d6247e44fff81cbbb Mon Sep 17 00:00:00 2001 From: michplunkett <5885605+michplunkett@users.noreply.github.com> Date: Wed, 27 Dec 2023 23:18:56 -0600 Subject: [PATCH 1/5] Update test_prs.yml --- .github/workflows/test_prs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_prs.yml b/.github/workflows/test_prs.yml index 976ba2166..0e063c240 100644 --- a/.github/workflows/test_prs.yml +++ b/.github/workflows/test_prs.yml @@ -19,7 +19,7 @@ jobs: FLASK_APP: OpenOversight.app strategy: matrix: - python-version: ["3.11"] + python-version: ["3.11", "3.12"] # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it From 41104ffe3736a95f4e44280c793c899071a229ac Mon Sep 17 00:00:00 2001 From: michplunkett <5885605+michplunkett@users.noreply.github.com> Date: Wed, 27 Dec 2023 23:29:17 -0600 Subject: [PATCH 2/5] Update test_prs.yml --- .github/workflows/test_prs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_prs.yml b/.github/workflows/test_prs.yml index 0e063c240..fcb844378 100644 --- a/.github/workflows/test_prs.yml +++ b/.github/workflows/test_prs.yml @@ -19,7 +19,7 @@ jobs: FLASK_APP: OpenOversight.app strategy: matrix: - python-version: ["3.11", "3.12"] + python-version: ["3.11", "3.12-rc"] # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it From 3d47d1314a6b25ec8ec54fec3e44fde9787dede9 Mon Sep 17 00:00:00 2001 From: michplunkett <5885605+michplunkett@users.noreply.github.com> Date: Thu, 28 Dec 2023 22:21:55 -0600 Subject: [PATCH 3/5] Update test_prs.yml --- .github/workflows/test_prs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_prs.yml b/.github/workflows/test_prs.yml index fcb844378..0e063c240 100644 --- a/.github/workflows/test_prs.yml +++ b/.github/workflows/test_prs.yml @@ -19,7 +19,7 @@ jobs: FLASK_APP: OpenOversight.app strategy: matrix: - python-version: ["3.11", "3.12-rc"] + python-version: ["3.11", "3.12"] # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it From 744f13c4ea3794dcb872ba7057955b6ec2be467d Mon Sep 17 00:00:00 2001 From: michplunkett <5885605+michplunkett@users.noreply.github.com> Date: Thu, 28 Dec 2023 22:21:58 -0600 Subject: [PATCH 4/5] Update Dockerfile --- dockerfiles/web/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/web/Dockerfile b/dockerfiles/web/Dockerfile index 0001d311a..16695a134 100644 --- a/dockerfiles/web/Dockerfile +++ b/dockerfiles/web/Dockerfile @@ -1,6 +1,6 @@ ARG MAKE_PYTHON_VERSION ARG DOCKER_BUILD_ENV -FROM python:${MAKE_PYTHON_VERSION:-3.11}-buster +FROM python:${MAKE_PYTHON_VERSION:-3.11}-slim-bullseye WORKDIR /usr/src/app From 2596155505abf908ea0988428be77a3df6d07bcd Mon Sep 17 00:00:00 2001 From: michplunkett <5885605+michplunkett@users.noreply.github.com> Date: Thu, 28 Dec 2023 22:24:25 -0600 Subject: [PATCH 5/5] Update Dockerfile --- dockerfiles/web/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/web/Dockerfile b/dockerfiles/web/Dockerfile index 16695a134..5a8abd600 100644 --- a/dockerfiles/web/Dockerfile +++ b/dockerfiles/web/Dockerfile @@ -1,6 +1,6 @@ ARG MAKE_PYTHON_VERSION ARG DOCKER_BUILD_ENV -FROM python:${MAKE_PYTHON_VERSION:-3.11}-slim-bullseye +FROM python:${MAKE_PYTHON_VERSION:-3.11}-bullseye WORKDIR /usr/src/app