Skip to content

Commit

Permalink
Merge pull request #105 from ACMAS/maintenance/vulnerability-patch
Browse files Browse the repository at this point in the history
Vulnerability fixes and upgrades (requirements and Python version)
  • Loading branch information
jaw12346 authored Nov 7, 2023
2 parents 8cd939f + 07fc9bb commit 438abee
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/django.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: [3.10.7]
python-version: [3.12]

steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion ACMAS/app/ACMAS/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"django.contrib.contenttypes",
"django.contrib.sessions",
"django.contrib.messages",
"django.contrib.staticfiles",
"django_components.safer_staticfiles",
"ACMAS_Web",
"django_components",
]
Expand Down
4 changes: 2 additions & 2 deletions ACMAS/app/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
###########

# pull official base image
FROM python:3.11.5-alpine AS builder
FROM python:3.12-alpine AS builder

# set work directory
WORKDIR /usr/src/app
Expand All @@ -31,7 +31,7 @@ RUN pip wheel --no-cache-dir --no-deps --wheel-dir /usr/src/app/wheels -r requir
#########

# pull official base image
FROM python:3.11.5-alpine
FROM python:3.12-alpine
RUN apk update --no-cache

####################################
Expand Down
6 changes: 3 additions & 3 deletions ACMAS/app/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Django==4.2.7
django-dbbackup==4.0.2
django_components
django_components==0.29

psycopg2-binary==2.9.7
gunicorn==20.1.0
psycopg2-binary==2.9.9
gunicorn==21.2.0
2 changes: 1 addition & 1 deletion ACMAS/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ services:
ports:
- "5432:5432"
nginx:
image: nginx:1.21-alpine
image: nginx:1.25.3-alpine
volumes:
- ./nginx/conf.d/:/etc/nginx/conf.d/
- static_files:/home/app/web/staticfiles
Expand Down

0 comments on commit 438abee

Please sign in to comment.