From 63af5c3ca929ce845abbd90bd96be3107fe1030d Mon Sep 17 00:00:00 2001 From: Almad Date: Sat, 2 Mar 2024 14:32:27 +0100 Subject: [PATCH] Upgrade MySQL dependency (refs #427) --- .docker/web/Dockerfile | 2 +- .docker/web/requirements.txt | 15 --------------- docker-compose.server_ci.yml | 2 +- requirements.txt | 2 +- 4 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 .docker/web/requirements.txt diff --git a/.docker/web/Dockerfile b/.docker/web/Dockerfile index 54f2e23a..942c62ad 100644 --- a/.docker/web/Dockerfile +++ b/.docker/web/Dockerfile @@ -7,7 +7,7 @@ WORKDIR /code RUN pip install --upgrade pip -ADD requirements.txt . +ADD ../requirements.txt . RUN apt update \ && apt install -y memcached libmemcached-dev \ && pip install -r requirements.txt diff --git a/.docker/web/requirements.txt b/.docker/web/requirements.txt deleted file mode 100644 index 1ca1d9ed..00000000 --- a/.docker/web/requirements.txt +++ /dev/null @@ -1,15 +0,0 @@ -Django>=2.0.0,<2.1 -mysqlclient>=1.3.7,<1.4 -gunicorn -sqlparse -argon2-cffi -bcrypt -pytz -pyyaml -sentry-sdk>=0.14.1 -selenium -whitenoise -django-storages<1.10 -boto3 -django-bmemcached -python-binary-memcached diff --git a/docker-compose.server_ci.yml b/docker-compose.server_ci.yml index a886f824..a0bbed84 100644 --- a/docker-compose.server_ci.yml +++ b/docker-compose.server_ci.yml @@ -7,7 +7,7 @@ version: '3' services: db: - image: mysql:5.5 + image: mysql:8.0 environment: - MYSQL_ROOT_PASSWORD=docker - MYSQL_DATABASE=ddcz diff --git a/requirements.txt b/requirements.txt index 1ca1d9ed..f1f7d42e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ Django>=2.0.0,<2.1 -mysqlclient>=1.3.7,<1.4 +mysqlclient gunicorn sqlparse argon2-cffi