Merge pull request #57 from openfido/develop

Develop

Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.0.0-experimental
-FROM python:3.8-slim as base
+FROM python:3.10-slim as base
 
 SHELL ["/bin/bash", "-c"]
 
@@ -10,8 +10,11 @@ EXPOSE 5000
 
 FROM base as python-deps
 
-RUN apt-get update -qq && apt-get install -y ssh git openssl
-RUN apt-get upgrade -y openssl
+RUN apt-get update -qq && apt-get install -y ssh git openssl bash
+# Install required system dependencies including Nginx
+RUN apt-get install -y libpq-dev python3-psycopg2 mariadb-client postgresql-client
+RUN apt-get install -y python3-dev default-libmysqlclient-dev build-essential
+RUN apt-get upgrade -y openssl bash dash
 
 # require a private key to access private github repositories
 ARG SSH_PRIVATE_KEY

Dockerfile.worker

@@ -1,9 +1,12 @@
 # syntax=docker/dockerfile:1.0.0-experimental
-FROM python:3.8-slim as base
+FROM python:3.10-slim as base
 
 SHELL ["/bin/bash", "-c"]
 
-RUN apt-get update -qq && apt-get install -y ssh git
+RUN apt-get update -qq && apt-get install -y ssh git bash
+RUN apt-get install -y libpq-dev python3-psycopg2 mariadb-client postgresql-client
+RUN apt-get install -y python3-dev default-libmysqlclient-dev build-essential
+RUN apt-get upgrade -y bash dash
 
 # require a private key to access private github repositories
 ARG SSH_PRIVATE_KEY
@@ -46,6 +49,8 @@ RUN chmod a+r /etc/apt/keyrings/docker.asc
 RUN echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian $(. /etc/os-release && echo "$VERSION_CODENAME") stable" > /etc/apt/sources.list.d/docker.list
 RUN apt-get update
 
+
+
 RUN apt install -y docker-ce git
 RUN apt-get clean
 

requirements.txt

@@ -57,7 +57,7 @@ sqlalchemy==1.3.20
 starkbank-ecdsa==1.1.0
 tld==0.12.2
 toml==0.10.1
-typed-ast==1.4.1
+typed-ast==1.5.5
 typing-extensions==3.7.4.3
 urllib3==1.25.11
 werkzeug==1.0.1
@@ -75,6 +75,6 @@ pylint==2.6.0
 pylint-flask-sqlalchemy==0.2.0
 pyrsistent==0.17.3
 pyyaml==5.3.1
-wrapt==1.12.1
+wrapt==1.16.0
 vine==5.0.0
 certifi>=2023.7.22 # not directly required, pinned by Snyk to avoid a vulnerability