Skip to content

Commit

Permalink
Bump docker (#918)
Browse files Browse the repository at this point in the history
* Bump docker base image to python 3.12.1

* Add libffi-dev

* Add chardet

* Dumping logs in CI

* Remove tmp CI step, bump gunicorn
  • Loading branch information
jbirddog authored Jan 29, 2024
1 parent 46a7aab commit 6c209fe
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 9 deletions.
4 changes: 2 additions & 2 deletions spiffworkflow-backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Base image to share ENV vars that activate VENV.
FROM python:3.11.6-slim-bookworm AS base
FROM python:3.12.1-slim-bookworm AS base

ENV VIRTUAL_ENV=/app/venv
RUN python3 -m venv $VIRTUAL_ENV
Expand Down Expand Up @@ -45,7 +45,7 @@ RUN useradd _gunicorn --no-create-home --user-group

# default-libmysqlclient-dev for mysqlclient lib
RUN apt-get update \
&& apt-get install -y -q gcc libssl-dev libpq-dev default-libmysqlclient-dev pkg-config
&& apt-get install -y -q gcc libssl-dev libpq-dev default-libmysqlclient-dev pkg-config libffi-dev

# poetry install takes a long time and can be cached if dependencies don't change,
# so that's why we tolerate running it twice.
Expand Down
23 changes: 17 additions & 6 deletions spiffworkflow-backend/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion spiffworkflow-backend/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ connexion = {extras = [ "swagger-ui",], version = "^2"}
lxml = "^4.9.1"
marshmallow-enum = "^1.5.1"
PyJWT = "^2.6.0"
gunicorn = "^20.1.0"
gunicorn = "^21.0.0"
APScheduler = "*"
Jinja2 = "^3.1.3"
RestrictedPython = "^7.0"
Expand Down Expand Up @@ -80,6 +80,7 @@ flask-oauthlib = "^0.9.6"
celery = {extras = ["redis"], version = "^5.3.5"}
celery-stubs = "^0.1.3"
jsonschema = "^4.20.0"
chardet = "^5.2.0"

[tool.poetry.scripts]
spiffworkflow-backend = "spiffworkflow_backend.__main__:main"
Expand Down

0 comments on commit 6c209fe

Please sign in to comment.